Skip to content
Permalink
Browse files

fix conflicts

  • Loading branch information...
SteveMieskoski committed Nov 29, 2018
1 parent e78ec3b commit 4852dc28b03c6636daebae290fcc9781c2392e56
Showing with 2 additions and 86 deletions.
  1. +1 −43 chrome-extension/js/etherwallet-master.js
  2. +1 −43 dist/js/etherwallet-master.js
module.exports = bity;

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

var darklist = function darklist() {
return [{
address: "0xF193a9aFb00715AaCF7ca9Ebffafe02C77517C2E",
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)
module.exports = walletDecryptDrtv;

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

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


},{}],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');
}

},{}],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');
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)
module.exports = walletService;

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

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

module.exports = SolidityTypeAddress;

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

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

module.exports = SolidityTypeBool;

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

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

module.exports = SolidityTypeBytes;

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

/*
This file is part of web3.js.

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.

};

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

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

module.exports = SolidityTypeDynamicBytes;

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

/*
This file is part of web3.js.

};

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

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

module.exports = SolidityTypeInt;

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

/*
This file is part of web3.js.

module.exports = SolidityParam;

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

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

module.exports = SolidityTypeReal;

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

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

module.exports = SolidityTypeString;

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

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

module.exports = SolidityType;

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

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

module.exports = SolidityTypeUInt;

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

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

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; };

/*

}).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"); } }
module.exports = bity;

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

var darklist = function darklist() {
return [{
address: "0xF193a9aFb00715AaCF7ca9Ebffafe02C77517C2E",
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)
module.exports = walletDecryptDrtv;

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

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


},{}],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');
}

},{}],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');
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)
module.exports = walletService;

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

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

module.exports = SolidityTypeAddress;

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

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

module.exports = SolidityTypeBool;

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

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

module.exports = SolidityTypeBytes;

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

/*
This file is part of web3.js.

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.

};

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

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

module.exports = SolidityTypeDynamicBytes;

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

/*
This file is part of web3.js.

};

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

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

module.exports = SolidityTypeInt;

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

/*
This file is part of web3.js.

module.exports = SolidityParam;

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

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

module.exports = SolidityTypeReal;

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

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

module.exports = SolidityTypeString;

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

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

module.exports = SolidityType;

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

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

module.exports = SolidityTypeUInt;

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

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

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; };

/*

}).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"); } }

0 comments on commit 4852dc2

Please sign in to comment.
You can’t perform that action at this time.