Merge pull request #601 from tokencard/remove_some_ens

tokencard · Jul 16, 2020 · c1e8aa6 · c1e8aa6
2 parents 6dc76df + 81531ad
commit c1e8aa6
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 41 deletions.
diff --git a/contracts/internals/ensResolvable.sol b/contracts/internals/ensResolvable.sol
@@ -36,7 +36,7 @@ contract ENSResolvable is Initializable {
  }
 
  /// @notice this is used to that one can observe which ENS registry is being used
- function ensRegistry() external view returns (address) {
+ function ensRegistry() public view returns (address) {
  return _ensRegistry;
  }
 

diff --git a/contracts/walletCache.sol b/contracts/walletCache.sol
@@ -48,7 +48,6 @@ contract WalletCache is ENSResolvable, Controllable {
  bytes32 public walletDeployerNode = _DEFAULT_WALLET_DEPLOYER_NODE;
 
  address public walletImplementation;
- address public ens;
  uint256 public defaultSpendLimit;
 
  address payable[] public cachedWallets;
@@ -67,7 +66,6 @@ contract WalletCache is ENSResolvable, Controllable {
  _initializeENSResolvable(_ens_);
  _initializeControllable(_controllerNode_);
  walletImplementation = _walletImplementation_;
- ens = _ens_;
  defaultSpendLimit = _defaultSpendLimit_;
 
  // Set licenceNode or use default
@@ -113,7 +111,7 @@ contract WalletCache is ENSResolvable, Controllable {
  Wallet(wallet).initializeWallet(
  address(uint160(walletDeployerAddress)), // the address(uint160()) cast is done as the Wallet owner (1st argument) needs to be payable
  true,
- ens,
+ ensRegistry(),
  tokenWhitelistNode,
  controllerNode(),
  licenceNode,

diff --git a/pkg/bindings/holder.go b/pkg/bindings/holder.go
diff --git a/pkg/bindings/licence.go b/pkg/bindings/licence.go
diff --git a/pkg/bindings/mocks/isValidSignatureExporter.go b/pkg/bindings/mocks/isValidSignatureExporter.go
diff --git a/pkg/bindings/mocks/tokenWhitelistableExporter.go b/pkg/bindings/mocks/tokenWhitelistableExporter.go
diff --git a/pkg/bindings/oracle.go b/pkg/bindings/oracle.go
diff --git a/pkg/bindings/tokenWhitelist.go b/pkg/bindings/tokenWhitelist.go
diff --git a/pkg/bindings/wallet.go b/pkg/bindings/wallet.go
diff --git a/pkg/bindings/walletCache.go b/pkg/bindings/walletCache.go
diff --git a/pkg/bindings/walletDeployer.go b/pkg/bindings/walletDeployer.go
diff --git a/tools/slither/slither.db.json b/tools/slither/slither.db.json