Skip to content
Permalink
Browse files

Merge branch 'develop' of github.com:gnosis/MultiSigWallet into develop

  • Loading branch information...
giacomolicari committed Jan 29, 2018
2 parents 0c58ae3 + de72b72 commit 96effe05d7b5d30c1557e6b20044fe0372af4258
@@ -41,7 +41,6 @@
"abi-decoder": "1.0.8",
"SpinKit": "spinkit#^1.2.5",
"web3-provider-engine": "https://github.com/denisgranha/provider-engine.git#dce3f8d701eb1fcd794c86f2debb6af752aa44b3",
"eth-lightwallet": "https://github.com/ConsenSys/eth-lightwallet.git",
"file-saver": "^1.3.3",
"hooked-web3-provider": "https://github.com/ConsenSys/hooked-web3-provider.git",
"entropy-collector": "https://github.com/vibornoff/entropy-collector.js.git",
@@ -3,13 +3,6 @@ var txDefaultOrig =
gasLimit: 3141592,
gasPrice: 18000000000,
ethereumNode: "https://mainnet.infura.io:443",
alertNode: {
url : "https://alerts.gnosis.pm",
authCode: null,
name: "Mainnet",
managementPage: "https://alerts.gnosis.pm/api/alert/manage/?code={auth-code}",
managementRoute: "api/alert/manage"
},
connectionChecker:{
method : "OPTIONS",
url : "https://www.google.com",
@@ -131,22 +124,6 @@ var txDefault = {
name: "Local node"
}
],
alertNodes: {
'mainnet': {
url: 'https://alerts.gnosis.pm',
authCode: null,
name: 'Mainnet',
networkId: 1,
managementPage: "https://alerts.gnosis.pm/api/alert/manage/?code={auth-code}"
},
'kovan': {
url: 'https://testalerts.gnosis.pm',
authCode: null,
name: 'Kovan',
networkId: 42,
managementPage: "https://testalerts.gnosis.pm/api/alert/manage/?code={auth-code}"
}
},
walletFactoryAddresses: {
'mainnet': {
name: 'Mainnet',
@@ -167,6 +144,24 @@ var txDefault = {
}
};

var oldWalletFactoryAddresses = [
("0x12ff9a987c648c5608b2c2a76f58de74a3bf1987").toLowerCase(),
("0xed5a90efa30637606ddaf4f4b3d42bb49d79bd4e").toLowerCase(),
("0xa0dbdadcbcc540be9bf4e9a812035eb1289dad73").toLowerCase()
];

/**
* Update the default wallet factory address in local storage
*/
function checkWalletFactoryAddress() {
var userConfig = JSON.parse(localStorage.getItem("userConfig"));

if (userConfig && oldWalletFactoryAddresses.indexOf(userConfig.walletFactoryAddress.toLowerCase()) >= 0) {
userConfig.walletFactoryAddress = txDefaultOrig.walletFactoryAddress;
localStorage.setItem("userConfig", JSON.stringify(userConfig));
}
}

/**
* Reload configuration
*/
@@ -175,4 +170,5 @@ function loadConfiguration () {
Object.assign(txDefault, txDefaultOrig, userConfig);
}

checkWalletFactoryAddress();
loadConfiguration();

This file was deleted.

Oops, something went wrong.
@@ -5,12 +5,14 @@
.controller("depositCtrl", function ($scope, Transaction, $routeParams, $uibModalInstance, Wallet, Utils, wallet, Web3Service) {
$scope.wallet = wallet;
$scope.amount = 10;
$scope.deposit = function () {
$scope.deposit = function () {
Transaction.send(
{
to: $scope.wallet.address,
from: Web3Service.coinbase,
value: new ethereumjs.BN(new Web3().toWei($scope.amount))
value: new ethereumjs.BN(new Web3().toWei($scope.amount)),
gas: 50000,
gasPrice: Wallet.txParams.gasPrice
},
function (e, tx) {
if (e) {
@@ -13,6 +13,7 @@

$scope.confirmations = 1;
$scope.limit = 0;
$scope.maxAllowedConfirmations = 1;

$scope.removeOwner = function (address) {
delete $scope.owners[address];
@@ -102,6 +103,7 @@
$scope.addOwner = function () {
$scope.owners[$scope.newOwner.address] = $scope.newOwner;
$scope.newOwner = {}; // reset values
$scope.maxAllowedConfirmations = Object.keys($scope.owners).length
};
});
}

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 96effe0

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