-
Notifications
You must be signed in to change notification settings - Fork 158
Update greeter contract for modern solc #15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
dangerousfood
wants to merge
2
commits into
web3j:master
Choose a base branch
from
dangerousfood:update-greeter-contract
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,38 @@ | ||
| pragma solidity ^0.4.25; | ||
|
|
||
| // Modified Greeter contract. Based on example at https://www.ethereum.org/greeter. | ||
| pragma solidity >=0.4.22 <0.6.0; | ||
|
|
||
| contract Mortal { | ||
| /* Define variable owner of the type address*/ | ||
| /* Define variable owner of the type address */ | ||
| address owner; | ||
|
|
||
| /* this function is executed at initialization and sets the owner of the contract */ | ||
| constructor () public { owner = msg.sender; } | ||
| /* This constructor is executed at initialization and sets the owner of the contract */ | ||
| constructor() public { owner = msg.sender; } | ||
|
|
||
| /* Function to recover the funds on the contract */ | ||
| function kill() public { if (msg.sender == owner) selfdestruct(owner); } | ||
| function kill() public { if (msg.sender == owner) selfdestruct(msg.sender); } | ||
| } | ||
|
|
||
| contract Greeter is Mortal { | ||
| /* define variable greeting of the type string */ | ||
| /* Define variable greeting of the type string */ | ||
| string greeting; | ||
|
|
||
| /* this runs when the contract is executed */ | ||
| constructor (string _greeting) public { | ||
| /* This runs when the contract is executed */ | ||
| constructor(string memory _greeting) public { | ||
| greeting = _greeting; | ||
| } | ||
|
|
||
| function newGreeting(string _greeting) public { | ||
| function newGreeting(string memory _greeting) public { | ||
| emit Modified(greeting, _greeting, greeting, _greeting); | ||
| greeting = _greeting; | ||
| } | ||
|
|
||
| /* main function */ | ||
| function greet() public constant returns (string) { | ||
| /* Main function */ | ||
| function greet() public view returns (string memory) { | ||
| return greeting; | ||
| } | ||
|
|
||
| /* we include indexed events to demonstrate the difference that can be | ||
| captured versus non-indexed */ | ||
| captured versus non-indexed */ | ||
| event Modified( | ||
| string indexed oldGreetingIdx, string indexed newGreetingIdx, | ||
| string oldGreeting, string newGreeting); | ||
| } | ||
| string indexed oldGreetingIdx, string indexed newGreetingIdx, | ||
| string oldGreeting, string newGreeting); | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what was the reason for adding the
memorydeclaration to strings? As function parameters is this not already implicit? I'd like to keep the code as simple as possible for users unfamiliar to Solidity, so I'd rather keep the memory declaration out if we can.