Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-nameservice
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-nameservice
Commits
dab88e74
Commit
dab88e74
authored
5 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
contract: update for solidity 0.6
Change-Id: I436c8e8cec32b72e84208c9d0aa5df91c1dcc01f
parent
493679b9
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
contract/registrar.sol
+17
-17
17 additions, 17 deletions
contract/registrar.sol
with
17 additions
and
17 deletions
contract/registrar.sol
+
17
−
17
View file @
dab88e74
pragma solidity
^
0.
5
.2;
pragma solidity
>=
0.
4
.2
2 <0.7.0
;
/*
* Copyright (c) 2014 Gav Wood <g@ethdev.com>
* Copyright (c) 2016 Savoir-faire Linux Inc.
...
...
@@ -12,10 +12,10 @@ pragma solidity ^0.5.2;
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* urnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
...
...
@@ -25,21 +25,21 @@ pragma solidity ^0.5.2;
* SOFTWARE.
*/
contr
ac
t
NameRegister {
function addr(bytes32 _name)
public view
returns (address o_owner)
{}
function name(address _owner)
public view
returns (bytes32 o_name)
{}
interf
ac
e
NameRegister {
function addr(bytes32 _name)
view external
returns (address o_owner)
;
function name(address _owner)
view external
returns (bytes32 o_name)
;
}
contr
ac
t
Registrar is NameRegister {
interf
ac
e
Registrar is NameRegister {
event Changed(bytes32 indexed name);
event PrimaryChanged(bytes32 indexed name, address indexed addr, address owner);
function owner(bytes32 _name)
public view
returns (address o_owner)
{}
function addr(bytes32 _name)
public view
returns (address o_address)
{}
function subRegistrar(bytes32 _name)
public view
returns (address o_subRegistrar)
{}
function content(bytes32 _name)
public view
returns (bytes32 o_content)
{}
function owner(bytes32 _name)
view external
returns (address o_owner)
;
function addr(bytes32 _name)
view external override(NameRegister)
returns (address o_address)
;
function subRegistrar(bytes32 _name)
view external
returns (address o_subRegistrar)
;
function content(bytes32 _name)
view external
returns (bytes32 o_content)
;
function name(address _owner)
public view
returns (bytes32 o_name)
{}
function name(address _owner)
view external override(NameRegister)
returns (bytes32 o_name)
;
}
contract GlobalRegistrar is Registrar {
...
...
@@ -111,11 +111,11 @@ contract GlobalRegistrar is Registrar {
emit Changed(_name);
}
function owner(bytes32 _name) public view returns (address) { return m_toRecord[_name].owner; }
function addr(bytes32 _name) public view returns (address) { return m_toRecord[_name].primary; }
function
r
egist
e
r(bytes32 _name) public view returns (address) { return m_toRecord[_name].subRegistrar; }
function content(bytes32 _name) public view returns (bytes32) { return m_toRecord[_name].content; }
function name(address _a) public view returns (bytes32 o_name) { return m_toName[_a]; }
function owner(bytes32 _name) public view
override(Registrar)
returns (address) { return m_toRecord[_name].owner; }
function addr(bytes32 _name) public view
override(Registrar)
returns (address) { return m_toRecord[_name].primary; }
function
subR
egist
ra
r(bytes32 _name) public view
override(Registrar)
returns (address) { return m_toRecord[_name].subRegistrar; }
function content(bytes32 _name) public view
override(Registrar)
returns (bytes32) { return m_toRecord[_name].content; }
function name(address _a) public view
override(Registrar)
returns (bytes32 o_name) { return m_toName[_a]; }
function publickey(bytes32 _name) public view returns (string memory) { return m_toRecord[_name].publicKey; }
function signature(bytes32 _name) public view returns (string memory) { return m_toRecord[_name].signedName; }
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment