Adding more function external

sirhill · sirhill · commit 57df90c752a8 · 2020-06-22T18:47:15.000+02:00
diff --git a/token/contracts/TokenCore.sol b/token/contracts/TokenCore.sol
@@ -94,15 +94,15 @@ contract TokenCore is ITokenCore, OperableCore, TokenStorage {
   function auditCurrency(
     address _scope,
     uint256 _scopeId
-  ) override public view returns (address currency) {
+  ) override external view returns (address currency) {
     return audits[_scope][_scopeId].currency;
   }
 
   function audit(
     address _scope,
     uint256 _scopeId,
     AuditStorageMode _storageMode,
-    bytes32 _storageId) override public view returns (
+    bytes32 _storageId) override external view returns (
     uint64 createdAt,
     uint64 lastTransactionAt,
     uint256 cumulatedEmission,
@@ -126,70 +126,64 @@ contract TokenCore is ITokenCore, OperableCore, TokenStorage {
   }
 
   /**************  ERC20  **************/
-  function tokenName() override public view returns (string memory) {
+  function tokenName() override external view returns (string memory) {
     return tokens[msg.sender].name;
   }
 
-  function tokenSymbol() override public view returns (string memory) {
+  function tokenSymbol() override external view returns (string memory) {
     return tokens[msg.sender].symbol;
   }
 
-  function decimals() override public onlyProxy returns (uint256) {
+  function decimals() override external onlyProxy returns (uint256) {
     return delegateCallUint256(msg.sender);
   }
 
-  function totalSupply() override public onlyProxy returns (uint256) {
+  function totalSupply() override external onlyProxy returns (uint256) {
     return delegateCallUint256(msg.sender);
   }
 
-  function balanceOf(address) public onlyProxy override returns (uint256) {
+  function balanceOf(address) external onlyProxy override returns (uint256) {
     return delegateCallUint256(msg.sender);
   }
 
   function allowance(address, address)
-    override public onlyProxy returns (uint256)
+    override external onlyProxy returns (uint256)
   {
     return delegateCallUint256(msg.sender);
   }
 
   function transfer(address, address, uint256)
-    override public onlyProxy returns (bool status)
+    override external onlyProxy returns (bool status)
   {
     return delegateCall(msg.sender);
   }
 
   function transferFrom(address, address, address, uint256)
-    override public onlyProxy returns (bool status)
+    override external onlyProxy returns (bool status)
   {
     return delegateCall(msg.sender);
   }
 
   function approve(address, address, uint256)
-    override public onlyProxy returns (bool status)
+    override external onlyProxy returns (bool status)
   {
     return delegateCall(msg.sender);
   }
 
   function increaseApproval(address, address, uint256)
-    override public onlyProxy returns (bool status)
+    override external onlyProxy returns (bool status)
   {
     return delegateCall(msg.sender);
   }
 
   function decreaseApproval(address, address, uint256)
-    override public onlyProxy returns (bool status)
+    override external onlyProxy returns (bool status)
   {
     return delegateCall(msg.sender);
   }
 
-  function canTransfer(address, address, uint256)
-    override public onlyProxy returns (uint256)
-  {
-    return delegateCallUint256(msg.sender);
-  }
-
   /***********  TOKEN DATA   ***********/
-  function token(address _token) override public view returns (
+  function token(address _token) override external view returns (
     bool mintingFinished,
     uint256 allTimeMinted,
     uint256 allTimeBurned,
@@ -210,6 +204,12 @@ contract TokenCore is ITokenCore, OperableCore, TokenStorage {
     rules = tokenData.rules;
   }
 
+  function canTransfer(address, address, uint256)
+    override external onlyProxy returns (uint256)
+  {
+    return delegateCallUint256(msg.sender);
+  }
+
   /***********  TOKEN ADMIN  ***********/
   function mint(address _token, address[] calldata, uint256[] calldata)
     override external onlyProxyOp(_token) returns (bool)
diff --git a/token/contracts/interface/ITokenCore.sol b/token/contracts/interface/ITokenCore.sol
@@ -40,38 +40,38 @@ abstract contract ITokenCore is ITokenStorage, IOperableCore {
   function auditCurrency(
     address _scope,
     uint256 _scopeId
-  ) virtual public view returns (address currency);
+  ) virtual external view returns (address currency);
   function audit(
     address _scope,
     uint256 _scopeId,
     AuditStorageMode _storageMode,
-    bytes32 _storageId) virtual public view returns (
+    bytes32 _storageId) virtual external view returns (
     uint64 createdAt,
     uint64 lastTransactionAt,
     uint256 cumulatedEmission,
     uint256 cumulatedReception);
 
   /**************  ERC20  **************/
-  function tokenName() virtual public view returns (string memory);
-  function tokenSymbol() virtual public view returns (string memory);
+  function tokenName() virtual external view returns (string memory);
+  function tokenSymbol() virtual external view returns (string memory);
 
-  function decimals() virtual public returns (uint256);
-  function totalSupply() virtual public returns (uint256);
-  function balanceOf(address) virtual public returns (uint256);
-  function allowance(address, address) virtual public returns (uint256);
+  function decimals() virtual external returns (uint256);
+  function totalSupply() virtual external returns (uint256);
+  function balanceOf(address) virtual external returns (uint256);
+  function allowance(address, address) virtual external returns (uint256);
   function transfer(address, address, uint256)
-    virtual public returns (bool status);
+    virtual external returns (bool status);
   function transferFrom(address, address, address, uint256)
-    virtual public returns (bool status);
+    virtual external returns (bool status);
   function approve(address, address, uint256)
-    virtual public returns (bool status);
+    virtual external returns (bool status);
   function increaseApproval(address, address, uint256)
-    virtual public returns (bool status);
+    virtual external returns (bool status);
   function decreaseApproval(address, address, uint256)
-    virtual public returns (bool status);
+    virtual external returns (bool status);
 
   /***********  TOKEN DATA   ***********/
-  function token(address _token) virtual public view returns (
+  function token(address _token) external view virtual returns (
     bool mintingFinished,
     uint256 allTimeMinted,
     uint256 allTimeBurned,
@@ -81,7 +81,7 @@ abstract contract ITokenCore is ITokenStorage, IOperableCore {
     uint256 freezedUntil,
     IRule[] memory);
   function canTransfer(address, address, uint256)
-    virtual public returns (uint256);
+    virtual external returns (uint256);
 
   /***********  TOKEN ADMIN  ***********/
   function mint(address, address[] calldata, uint256[] calldata)

Original file line number	Diff line number	Diff line change
`@@ -94,15 +94,15 @@ contract TokenCore is ITokenCore, OperableCore, TokenStorage {`
`94`	`94`	`function auditCurrency(`
`95`	`95`	`address _scope,`
`96`	`96`	`uint256 _scopeId`
`97`		`- ) override public view returns (address currency) {`
	`97`	`+ ) override external view returns (address currency) {`
`98`	`98`	`return audits[_scope][_scopeId].currency;`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`function audit(`
`102`	`102`	`address _scope,`
`103`	`103`	`uint256 _scopeId,`
`104`	`104`	`AuditStorageMode _storageMode,`
`105`		`- bytes32 _storageId) override public view returns (`
	`105`	`+ bytes32 _storageId) override external view returns (`
`106`	`106`	`uint64 createdAt,`
`107`	`107`	`uint64 lastTransactionAt,`
`108`	`108`	`uint256 cumulatedEmission,`
`@@ -126,70 +126,64 @@ contract TokenCore is ITokenCore, OperableCore, TokenStorage {`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`/************ ERC20 ************/`
`129`		`- function tokenName() override public view returns (string memory) {`
	`129`	`+ function tokenName() override external view returns (string memory) {`
`130`	`130`	`return tokens[msg.sender].name;`
`131`	`131`	`}`
`132`	`132`
`133`		`- function tokenSymbol() override public view returns (string memory) {`
	`133`	`+ function tokenSymbol() override external view returns (string memory) {`
`134`	`134`	`return tokens[msg.sender].symbol;`
`135`	`135`	`}`
`136`	`136`
`137`		`- function decimals() override public onlyProxy returns (uint256) {`
	`137`	`+ function decimals() override external onlyProxy returns (uint256) {`
`138`	`138`	`return delegateCallUint256(msg.sender);`
`139`	`139`	`}`
`140`	`140`
`141`		`- function totalSupply() override public onlyProxy returns (uint256) {`
	`141`	`+ function totalSupply() override external onlyProxy returns (uint256) {`
`142`	`142`	`return delegateCallUint256(msg.sender);`
`143`	`143`	`}`
`144`	`144`
`145`		`- function balanceOf(address) public onlyProxy override returns (uint256) {`
	`145`	`+ function balanceOf(address) external onlyProxy override returns (uint256) {`
`146`	`146`	`return delegateCallUint256(msg.sender);`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`function allowance(address, address)`
`150`		`- override public onlyProxy returns (uint256)`
	`150`	`+ override external onlyProxy returns (uint256)`
`151`	`151`	`{`
`152`	`152`	`return delegateCallUint256(msg.sender);`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`function transfer(address, address, uint256)`
`156`		`- override public onlyProxy returns (bool status)`
	`156`	`+ override external onlyProxy returns (bool status)`
`157`	`157`	`{`
`158`	`158`	`return delegateCall(msg.sender);`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`function transferFrom(address, address, address, uint256)`
`162`		`- override public onlyProxy returns (bool status)`
	`162`	`+ override external onlyProxy returns (bool status)`
`163`	`163`	`{`
`164`	`164`	`return delegateCall(msg.sender);`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`function approve(address, address, uint256)`
`168`		`- override public onlyProxy returns (bool status)`
	`168`	`+ override external onlyProxy returns (bool status)`
`169`	`169`	`{`
`170`	`170`	`return delegateCall(msg.sender);`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`function increaseApproval(address, address, uint256)`
`174`		`- override public onlyProxy returns (bool status)`
	`174`	`+ override external onlyProxy returns (bool status)`
`175`	`175`	`{`
`176`	`176`	`return delegateCall(msg.sender);`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`function decreaseApproval(address, address, uint256)`
`180`		`- override public onlyProxy returns (bool status)`
	`180`	`+ override external onlyProxy returns (bool status)`
`181`	`181`	`{`
`182`	`182`	`return delegateCall(msg.sender);`
`183`	`183`	`}`
`184`	`184`
`185`		`- function canTransfer(address, address, uint256)`
`186`		`- override public onlyProxy returns (uint256)`
`187`		`- {`
`188`		`- return delegateCallUint256(msg.sender);`
`189`		`- }`
`190`		`-`
`191`	`185`	`/********* TOKEN DATA *********/`
`192`		`- function token(address _token) override public view returns (`
	`186`	`+ function token(address _token) override external view returns (`
`193`	`187`	`bool mintingFinished,`
`194`	`188`	`uint256 allTimeMinted,`
`195`	`189`	`uint256 allTimeBurned,`
`@@ -210,6 +204,12 @@ contract TokenCore is ITokenCore, OperableCore, TokenStorage {`
`210`	`204`	`rules = tokenData.rules;`
`211`	`205`	`}`
`212`	`206`
	`207`	`+ function canTransfer(address, address, uint256)`
	`208`	`+ override external onlyProxy returns (uint256)`
	`209`	`+ {`
	`210`	`+ return delegateCallUint256(msg.sender);`
	`211`	`+ }`
	`212`	`+`
`213`	`213`	`/********* TOKEN ADMIN *********/`
`214`	`214`	`function mint(address _token, address[] calldata, uint256[] calldata)`
`215`	`215`	`override external onlyProxyOp(_token) returns (bool)`