status-im
/
ens-usernames
mirror of https://github.com/status-im/ens-usernames.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

small logic fix

This commit is contained in:
Ricardo Guilherme Schmidt 2018-08-27 10:57:52 -03:00 committed by Barry G
parent d8a60a8201
commit 81aa4a4004
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contracts/registry/ENSSubdomainRegistry.sol
View File

@ -25,6 +25,7 @@ contract ENSSubdomainRegistry is Controlled {
event FundsOwner(bytes32 indexed subdomainhash, address fundsOwner); event FundsOwner(bytes32 indexed subdomainhash, address fundsOwner);
event DomainPrice(bytes32 indexed namehash, uint256 price); event DomainPrice(bytes32 indexed namehash, uint256 price);
event DomainMoved(bytes32 indexed namehash, address newRegistry); event DomainMoved(bytes32 indexed namehash, address newRegistry);
event SlashedSubdomain(bytes32 namehash, address reporter);
enum NodeState { Free, Owned, Moved } enum NodeState { Free, Owned, Moved }
struct Domain { struct Domain {
@ -194,15 +195,15 @@ contract ENSSubdomainRegistry is Controlled {
bytes32 userHash = keccak256(_subdomain); bytes32 userHash = keccak256(_subdomain);
bytes32 subdomainHash = keccak256(abi.encodePacked(_domainHash, userHash)); bytes32 subdomainHash = keccak256(abi.encodePacked(_domainHash, userHash));
require(accounts[subdomainHash].creationTime == 0, "Username not registered."); require(accounts[subdomainHash].creationTime > 0, "Username not registered.");
uint256 offendingChar = uint256(_subdomain[_offendingPos]); uint256 offendingChar = uint256(_subdomain[_offendingPos]);
require(offendingChar >= _rangeStart && offendingChar <= _rangeEnd, "Invalid range."); require(_rangeStart < offendingChar && _rangeEnd > offendingChar, "Invalid range.");
require( require(
MerkleProof.verifyProof( MerkleProof.verifyProof(
_proof, _proof,
unallowedCharactersMerkleRoot, unallowedCharactersMerkleRoot,
keccak256(abi.encodePacked(_rangeStart, _rangeEnd)) keccak256(abi.encodePacked(keccak256(abi.encodePacked(_rangeStart, _rangeEnd))))
), ),
"Invalid Proof." "Invalid Proof."
); );
@ -213,7 +214,10 @@ contract ENSSubdomainRegistry is Controlled {
uint256 amountToTransfer = accounts[subdomainHash].tokenBalance; uint256 amountToTransfer = accounts[subdomainHash].tokenBalance;
delete accounts[subdomainHash]; delete accounts[subdomainHash];
require(token.transfer(msg.sender, amountToTransfer), "Error in transfer."); if(amountToTransfer > 0){
require(token.transfer(msg.sender, amountToTransfer), "Error in transfer.");
}
emit SlashedSubdomain(subdomainHash, msg.sender);
} }
/** /**