Skip to content
This repository has been archived by the owner on Nov 21, 2019. It is now read-only.

Commit

Permalink
fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@SteveMieskoski
SteveMieskoski committed Nov 29, 2018
1 parent e78ec3b commit 4852dc2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 86 deletions.
44 changes: 1 addition & 43 deletions chrome-extension/js/etherwallet-master.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1011,8 +1011,6 @@ bity.post = function (path, data, callback) {
module.exports = bity;

},{}],27:[function(require,module,exports){
"use strict";

var darklist = function darklist() {
return [{
address: "0xF193a9aFb00715AaCF7ca9Ebffafe02C77517C2E",
Expand Down Expand Up @@ -9342,8 +9340,6 @@ var walletGenCtrl = function walletGenCtrl($scope) {
module.exports = walletGenCtrl;

},{}],51:[function(require,module,exports){
'use strict';

// For token sale holders:
// 1. Add the address users are sending to
// 2. Add the gas limit users should use to send successfully (this avoids OOG errors)
Expand Down Expand Up @@ -10099,8 +10095,6 @@ var walletDecryptDrtv = function walletDecryptDrtv() {
module.exports = walletDecryptDrtv;

},{"./walletDecryptDrtv.html":60}],62:[function(require,module,exports){
'use strict';

var ens = require('./ens');
var domainsaleInterface = require('./domainsaleConfigs/domainsaleABI.json');

Expand Down Expand Up @@ -10682,8 +10676,6 @@ module.exports=[

},{}],64:[function(require,module,exports){
(function (Buffer){
'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"); }); }; }

var uts46 = require('idna-uts46');
Expand Down Expand Up @@ -14228,8 +14220,6 @@ module.exports={
}

},{}],77:[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"); }); }; }

var mainKyberNetworkABI = require('./kyberConfig/KyberNetworkABI.json');
Expand Down Expand Up @@ -14691,7 +14681,7 @@ kyberFuncs.prototype.getTradeData = function (swapOrder, minRate) {
var funcABI = _this.kyberNetworkABI.trade;
var srcTokenAddress = _this.getTokenAddress(swapOrder.fromCoin);
var destTokenAddress = _this.getTokenAddress(swapOrder.toCoin);
var walletId = '0xDECAF9CD2367cdbb726E904cD6397eDFcAe6068D';
var walletId = '0x4247951c2eb6d0bA38d233fe7d542c8c80c9d46A';
var minConversionRate = _this.convertToTokenWei(minRate, 'ETH'); // Uses slippagePrice with fallback to MarketRate. 1 => Market Rate, but we could also set this as the quoted rate
var srcAmount = _this.convertToTokenWei(swapOrder.fromVal, swapOrder.fromCoin); //etherUnits.toWei(swapOrder.fromVal, "ether");
var maxDestAmount = Math.pow(2, 200); //100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000; // Really big number (like a googol)
Expand Down Expand Up @@ -17534,8 +17524,6 @@ var walletService = function walletService() {
module.exports = walletService;

},{}],98:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityType = require('./type');

Expand Down Expand Up @@ -17564,8 +17552,6 @@ SolidityTypeAddress.prototype.isType = function (name) {
module.exports = SolidityTypeAddress;

},{"./formatters":104,"./type":109}],99:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityType = require('./type');

Expand Down Expand Up @@ -17594,8 +17580,6 @@ SolidityTypeBool.prototype.isType = function (name) {
module.exports = SolidityTypeBool;

},{"./formatters":104,"./type":109}],100:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityType = require('./type');

Expand Down Expand Up @@ -17627,8 +17611,6 @@ SolidityTypeBytes.prototype.isType = function (name) {
module.exports = SolidityTypeBytes;

},{"./formatters":104,"./type":109}],101:[function(require,module,exports){
'use strict';

/*
This file is part of web3.js.

Expand Down Expand Up @@ -17880,8 +17862,6 @@ var coder = new SolidityCoder([new SolidityTypeAddress(), new SolidityTypeBool()
module.exports = coder;

},{"./address":98,"./bool":99,"./bytes":100,"./dynamicbytes":103,"./formatters":104,"./int":105,"./real":107,"./string":108,"./uint":110,"./ureal":111,"./utils":112}],102:[function(require,module,exports){
'use strict';

/*
This file is part of web3.js.

Expand Down Expand Up @@ -17933,8 +17913,6 @@ module.exports = {
};

},{"bignumber.js":217}],103:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityType = require('./type');

Expand All @@ -17957,8 +17935,6 @@ SolidityTypeDynamicBytes.prototype.isDynamicType = function () {
module.exports = SolidityTypeDynamicBytes;

},{"./formatters":104,"./type":109}],104:[function(require,module,exports){
'use strict';

/*
This file is part of web3.js.

Expand Down Expand Up @@ -18212,8 +18188,6 @@ module.exports = {
};

},{"./config":102,"./param":106,"./utils":112,"bignumber.js":217}],105:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityType = require('./type');

Expand Down Expand Up @@ -18248,8 +18222,6 @@ SolidityTypeInt.prototype.isType = function (name) {
module.exports = SolidityTypeInt;

},{"./formatters":104,"./type":109}],106:[function(require,module,exports){
'use strict';

/*
This file is part of web3.js.

Expand Down Expand Up @@ -18401,8 +18373,6 @@ SolidityParam.encodeList = function (params) {
module.exports = SolidityParam;

},{"./utils":112}],107:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityType = require('./type');

Expand Down Expand Up @@ -18437,8 +18407,6 @@ SolidityTypeReal.prototype.isType = function (name) {
module.exports = SolidityTypeReal;

},{"./formatters":104,"./type":109}],108:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityType = require('./type');

Expand All @@ -18461,8 +18429,6 @@ SolidityTypeString.prototype.isDynamicType = function () {
module.exports = SolidityTypeString;

},{"./formatters":104,"./type":109}],109:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityParam = require('./param');

Expand Down Expand Up @@ -18715,8 +18681,6 @@ SolidityType.prototype.decode = function (bytes, offset, name) {
module.exports = SolidityType;

},{"./formatters":104,"./param":106}],110:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityType = require('./type');

Expand Down Expand Up @@ -18751,8 +18715,6 @@ SolidityTypeUInt.prototype.isType = function (name) {
module.exports = SolidityTypeUInt;

},{"./formatters":104,"./type":109}],111:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityType = require('./type');

Expand Down Expand Up @@ -18787,8 +18749,6 @@ SolidityTypeUReal.prototype.isType = function (name) {
module.exports = SolidityTypeUReal;

},{"./formatters":104,"./type":109}],112:[function(require,module,exports){
'use strict';

var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };

/*
Expand Down Expand Up @@ -19921,8 +19881,6 @@ module.exports = Ledger3;

}).call(this,require("buffer").Buffer)
},{"buffer":262,"u2f-api":847}],118:[function(require,module,exports){
'use strict';

var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
Expand Down
44 changes: 1 addition & 43 deletions dist/js/etherwallet-master.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1011,8 +1011,6 @@ bity.post = function (path, data, callback) {
module.exports = bity;

},{}],27:[function(require,module,exports){
"use strict";

var darklist = function darklist() {
return [{
address: "0xF193a9aFb00715AaCF7ca9Ebffafe02C77517C2E",
Expand Down Expand Up @@ -9342,8 +9340,6 @@ var walletGenCtrl = function walletGenCtrl($scope) {
module.exports = walletGenCtrl;

},{}],51:[function(require,module,exports){
'use strict';

// For token sale holders:
// 1. Add the address users are sending to
// 2. Add the gas limit users should use to send successfully (this avoids OOG errors)
Expand Down Expand Up @@ -10099,8 +10095,6 @@ var walletDecryptDrtv = function walletDecryptDrtv() {
module.exports = walletDecryptDrtv;

},{"./walletDecryptDrtv.html":60}],62:[function(require,module,exports){
'use strict';

var ens = require('./ens');
var domainsaleInterface = require('./domainsaleConfigs/domainsaleABI.json');

Expand Down Expand Up @@ -10682,8 +10676,6 @@ module.exports=[

},{}],64:[function(require,module,exports){
(function (Buffer){
'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"); }); }; }

var uts46 = require('idna-uts46');
Expand Down Expand Up @@ -14228,8 +14220,6 @@ module.exports={
}

},{}],77:[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"); }); }; }

var mainKyberNetworkABI = require('./kyberConfig/KyberNetworkABI.json');
Expand Down Expand Up @@ -14691,7 +14681,7 @@ kyberFuncs.prototype.getTradeData = function (swapOrder, minRate) {
var funcABI = _this.kyberNetworkABI.trade;
var srcTokenAddress = _this.getTokenAddress(swapOrder.fromCoin);
var destTokenAddress = _this.getTokenAddress(swapOrder.toCoin);
var walletId = '0xDECAF9CD2367cdbb726E904cD6397eDFcAe6068D';
var walletId = '0x4247951c2eb6d0bA38d233fe7d542c8c80c9d46A';
var minConversionRate = _this.convertToTokenWei(minRate, 'ETH'); // Uses slippagePrice with fallback to MarketRate. 1 => Market Rate, but we could also set this as the quoted rate
var srcAmount = _this.convertToTokenWei(swapOrder.fromVal, swapOrder.fromCoin); //etherUnits.toWei(swapOrder.fromVal, "ether");
var maxDestAmount = Math.pow(2, 200); //100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000; // Really big number (like a googol)
Expand Down Expand Up @@ -17534,8 +17524,6 @@ var walletService = function walletService() {
module.exports = walletService;

},{}],98:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityType = require('./type');

Expand Down Expand Up @@ -17564,8 +17552,6 @@ SolidityTypeAddress.prototype.isType = function (name) {
module.exports = SolidityTypeAddress;

},{"./formatters":104,"./type":109}],99:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityType = require('./type');

Expand Down Expand Up @@ -17594,8 +17580,6 @@ SolidityTypeBool.prototype.isType = function (name) {
module.exports = SolidityTypeBool;

},{"./formatters":104,"./type":109}],100:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityType = require('./type');

Expand Down Expand Up @@ -17627,8 +17611,6 @@ SolidityTypeBytes.prototype.isType = function (name) {
module.exports = SolidityTypeBytes;

},{"./formatters":104,"./type":109}],101:[function(require,module,exports){
'use strict';

/*
This file is part of web3.js.

Expand Down Expand Up @@ -17880,8 +17862,6 @@ var coder = new SolidityCoder([new SolidityTypeAddress(), new SolidityTypeBool()
module.exports = coder;

},{"./address":98,"./bool":99,"./bytes":100,"./dynamicbytes":103,"./formatters":104,"./int":105,"./real":107,"./string":108,"./uint":110,"./ureal":111,"./utils":112}],102:[function(require,module,exports){
'use strict';

/*
This file is part of web3.js.

Expand Down Expand Up @@ -17933,8 +17913,6 @@ module.exports = {
};

},{"bignumber.js":217}],103:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityType = require('./type');

Expand All @@ -17957,8 +17935,6 @@ SolidityTypeDynamicBytes.prototype.isDynamicType = function () {
module.exports = SolidityTypeDynamicBytes;

},{"./formatters":104,"./type":109}],104:[function(require,module,exports){
'use strict';

/*
This file is part of web3.js.

Expand Down Expand Up @@ -18212,8 +18188,6 @@ module.exports = {
};

},{"./config":102,"./param":106,"./utils":112,"bignumber.js":217}],105:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityType = require('./type');

Expand Down Expand Up @@ -18248,8 +18222,6 @@ SolidityTypeInt.prototype.isType = function (name) {
module.exports = SolidityTypeInt;

},{"./formatters":104,"./type":109}],106:[function(require,module,exports){
'use strict';

/*
This file is part of web3.js.

Expand Down Expand Up @@ -18401,8 +18373,6 @@ SolidityParam.encodeList = function (params) {
module.exports = SolidityParam;

},{"./utils":112}],107:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityType = require('./type');

Expand Down Expand Up @@ -18437,8 +18407,6 @@ SolidityTypeReal.prototype.isType = function (name) {
module.exports = SolidityTypeReal;

},{"./formatters":104,"./type":109}],108:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityType = require('./type');

Expand All @@ -18461,8 +18429,6 @@ SolidityTypeString.prototype.isDynamicType = function () {
module.exports = SolidityTypeString;

},{"./formatters":104,"./type":109}],109:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityParam = require('./param');

Expand Down Expand Up @@ -18715,8 +18681,6 @@ SolidityType.prototype.decode = function (bytes, offset, name) {
module.exports = SolidityType;

},{"./formatters":104,"./param":106}],110:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityType = require('./type');

Expand Down Expand Up @@ -18751,8 +18715,6 @@ SolidityTypeUInt.prototype.isType = function (name) {
module.exports = SolidityTypeUInt;

},{"./formatters":104,"./type":109}],111:[function(require,module,exports){
'use strict';

var f = require('./formatters');
var SolidityType = require('./type');

Expand Down Expand Up @@ -18787,8 +18749,6 @@ SolidityTypeUReal.prototype.isType = function (name) {
module.exports = SolidityTypeUReal;

},{"./formatters":104,"./type":109}],112:[function(require,module,exports){
'use strict';

var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };

/*
Expand Down Expand Up @@ -19921,8 +19881,6 @@ module.exports = Ledger3;

}).call(this,require("buffer").Buffer)
},{"buffer":262,"u2f-api":847}],118:[function(require,module,exports){
'use strict';

var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
Expand Down

0 comments on commit 4852dc2

Please sign in to comment.