mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Added default data locations to docs and other external tests.
This commit is contained in:
@@ -103,7 +103,7 @@ contract MultiSigWallet {
|
||||
/// @dev Contract constructor sets initial owners and required number of confirmations.
|
||||
/// @param _owners List of initial owners.
|
||||
/// @param _required Number of required confirmations.
|
||||
constructor(address[] _owners, uint _required)
|
||||
constructor(address[] memory _owners, uint _required)
|
||||
public
|
||||
validRequirement(_owners.length, _required)
|
||||
{
|
||||
@@ -185,7 +185,7 @@ contract MultiSigWallet {
|
||||
/// @param value Transaction ether value.
|
||||
/// @param data Transaction data payload.
|
||||
/// @return Returns transaction ID.
|
||||
function submitTransaction(address destination, uint value, bytes data)
|
||||
function submitTransaction(address destination, uint value, bytes memory data)
|
||||
public
|
||||
returns (uint transactionId)
|
||||
{
|
||||
@@ -261,7 +261,7 @@ contract MultiSigWallet {
|
||||
/// @param value Transaction ether value.
|
||||
/// @param data Transaction data payload.
|
||||
/// @return Returns transaction ID.
|
||||
function addTransaction(address destination, uint value, bytes data)
|
||||
function addTransaction(address destination, uint value, bytes memory data)
|
||||
internal
|
||||
notNull(destination)
|
||||
returns (uint transactionId)
|
||||
@@ -313,7 +313,7 @@ contract MultiSigWallet {
|
||||
function getOwners()
|
||||
public
|
||||
view
|
||||
returns (address[])
|
||||
returns (address[] memory)
|
||||
{
|
||||
return owners;
|
||||
}
|
||||
@@ -324,7 +324,7 @@ contract MultiSigWallet {
|
||||
function getConfirmations(uint transactionId)
|
||||
public
|
||||
view
|
||||
returns (address[] _confirmations)
|
||||
returns (address[] memory _confirmations)
|
||||
{
|
||||
address[] memory confirmationsTemp = new address[](owners.length);
|
||||
uint count = 0;
|
||||
@@ -348,7 +348,7 @@ contract MultiSigWallet {
|
||||
function getTransactionIds(uint from, uint to, bool pending, bool executed)
|
||||
public
|
||||
view
|
||||
returns (uint[] _transactionIds)
|
||||
returns (uint[] memory _transactionIds)
|
||||
{
|
||||
uint[] memory transactionIdsTemp = new uint[](transactionCount);
|
||||
uint count = 0;
|
||||
|
||||
@@ -11,7 +11,7 @@ contract MultiSigWalletFactory is Factory {
|
||||
/// @param _owners List of initial owners.
|
||||
/// @param _required Number of required confirmations.
|
||||
/// @return Returns wallet address.
|
||||
function create(address[] _owners, uint _required)
|
||||
function create(address[] memory _owners, uint _required)
|
||||
public
|
||||
returns (address wallet)
|
||||
{
|
||||
|
||||
@@ -19,7 +19,7 @@ contract MultiSigWalletWithDailyLimit is MultiSigWallet {
|
||||
/// @param _owners List of initial owners.
|
||||
/// @param _required Number of required confirmations.
|
||||
/// @param _dailyLimit Amount in wei, which can be withdrawn without confirmations on a daily basis.
|
||||
constructor(address[] _owners, uint _required, uint _dailyLimit)
|
||||
constructor(address[] memory _owners, uint _required, uint _dailyLimit)
|
||||
public
|
||||
MultiSigWallet(_owners, _required)
|
||||
{
|
||||
|
||||
@@ -12,7 +12,7 @@ contract MultiSigWalletWithDailyLimitFactory is Factory {
|
||||
/// @param _required Number of required confirmations.
|
||||
/// @param _dailyLimit Amount in wei, which can be withdrawn without confirmations on a daily basis.
|
||||
/// @return Returns wallet address.
|
||||
function create(address[] _owners, uint _required, uint _dailyLimit)
|
||||
function create(address[] memory _owners, uint _required, uint _dailyLimit)
|
||||
public
|
||||
returns (address wallet)
|
||||
{
|
||||
|
||||
@@ -50,7 +50,7 @@ contract ico is safeMath {
|
||||
uint256 public totalMint;
|
||||
uint256 public totalPremiumMint;
|
||||
|
||||
constructor(address foundation, address priceSet, uint256 exchangeRate, uint256 startBlockNum, address[] genesisAddr, uint256[] genesisValue) public {
|
||||
constructor(address foundation, address priceSet, uint256 exchangeRate, uint256 startBlockNum, address[] memory genesisAddr, uint256[] memory genesisValue) public {
|
||||
/*
|
||||
Installation function.
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ contract moduleHandler is multiOwner, announcementTypes {
|
||||
uint256 debugModeUntil = block.number + 1000000;
|
||||
|
||||
|
||||
constructor(address[] newOwners) multiOwner(newOwners) public {}
|
||||
constructor(address[] memory newOwners) multiOwner(newOwners) public {}
|
||||
function load(address foundation, bool forReplace, address Token, address Premium, address Publisher, address Schelling, address Provider) public {
|
||||
/*
|
||||
Loading modulest to ModuleHandler.
|
||||
@@ -60,7 +60,7 @@ contract moduleHandler is multiOwner, announcementTypes {
|
||||
addModule( modules_s(Schelling, keccak256('Schelling'), false, true), ! forReplace);
|
||||
addModule( modules_s(Provider, keccak256('Provider'), true, true), ! forReplace);
|
||||
}
|
||||
function addModule(modules_s input, bool call) internal {
|
||||
function addModule(modules_s memory input, bool call) internal {
|
||||
/*
|
||||
Inside function for registration of the modules in the database.
|
||||
If the call is false, won't happen any direct call.
|
||||
@@ -81,7 +81,7 @@ contract moduleHandler is multiOwner, announcementTypes {
|
||||
}
|
||||
modules[id] = input;
|
||||
}
|
||||
function getModuleAddressByName(string name) public view returns( bool success, bool found, address addr ) {
|
||||
function getModuleAddressByName(string memory name) public view returns( bool success, bool found, address addr ) {
|
||||
/*
|
||||
Search by name for module. The result is an Ethereum address.
|
||||
|
||||
@@ -109,7 +109,7 @@ contract moduleHandler is multiOwner, announcementTypes {
|
||||
}
|
||||
return (true, false, 0);
|
||||
}
|
||||
function getModuleIDByName(string name) public view returns( bool success, bool found, uint256 id ) {
|
||||
function getModuleIDByName(string memory name) public view returns( bool success, bool found, uint256 id ) {
|
||||
/*
|
||||
Search by name for module. The result is an index array.
|
||||
|
||||
@@ -177,7 +177,7 @@ contract moduleHandler is multiOwner, announcementTypes {
|
||||
require( abstractModule(modules[_id].addr).replaceModule(newModule) );
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
function newModule(string name, address addr, bool schellingEvent, bool transferEvent) external returns (bool success) {
|
||||
/*
|
||||
Adding new module to the database. Can be called only by the Publisher contract.
|
||||
|
||||
@@ -12,7 +12,7 @@ contract multiOwner is safeMath {
|
||||
/*
|
||||
Constructor
|
||||
*/
|
||||
constructor(address[] newOwners) public {
|
||||
constructor(address[] memory newOwners) public {
|
||||
for ( uint256 a=0 ; a<newOwners.length ; a++ ) {
|
||||
_addOwner(newOwners[a]);
|
||||
}
|
||||
@@ -41,7 +41,7 @@ contract multiOwner is safeMath {
|
||||
function ownersForChange() public view returns (uint256 owners) {
|
||||
return ownerCount * 75 / 100;
|
||||
}
|
||||
function calcDoHash(string job, bytes32 data) public pure returns (bytes32 hash) {
|
||||
function calcDoHash(string memory job, bytes32 data) public pure returns (bytes32 hash) {
|
||||
return keccak256(abi.encodePacked(job, data));
|
||||
}
|
||||
function validDoHash(bytes32 doHash) public view returns (bool valid) {
|
||||
|
||||
@@ -40,7 +40,7 @@ contract premium is module, safeMath {
|
||||
|
||||
mapping(address => bool) public genesis;
|
||||
|
||||
constructor(bool forReplace, address moduleHandler, address dbAddress, address icoContractAddr, address[] genesisAddr, uint256[] genesisValue) public {
|
||||
constructor(bool forReplace, address moduleHandler, address dbAddress, address icoContractAddr, address[] memory genesisAddr, uint256[] memory genesisValue) public {
|
||||
/*
|
||||
Setup function.
|
||||
If an ICOaddress is defined then the balance of the genesis addresses will be set as well.
|
||||
@@ -246,7 +246,7 @@ contract premium is module, safeMath {
|
||||
return true;
|
||||
}
|
||||
|
||||
function transferToContract(address from, address to, uint256 amount, bytes extraData) internal {
|
||||
function transferToContract(address from, address to, uint256 amount, bytes memory extraData) internal {
|
||||
/*
|
||||
Inner function in order to transact a contract.
|
||||
|
||||
|
||||
@@ -299,7 +299,7 @@ contract provider is module, safeMath, announcementTypes {
|
||||
providers[addr].data[currHeight].currentRate = rate;
|
||||
emit EProviderDetailsChanged(addr, currHeight, website, country, info, rate, admin);
|
||||
}
|
||||
function getProviderInfo(address addr, uint256 height) public view returns (string name, string website, string country, string info, uint256 create) {
|
||||
function getProviderInfo(address addr, uint256 height) public view returns (string memory name, string memory website, string memory country, string memory info, uint256 create) {
|
||||
/*
|
||||
for the infos of the provider.
|
||||
In case the height is unknown then the system will use the last known height.
|
||||
|
||||
@@ -70,7 +70,7 @@ contract publisher is announcementTypes, module, safeMath {
|
||||
super.registerModuleHandler(moduleHandler);
|
||||
}
|
||||
|
||||
function Announcements(uint256 id) public view returns (uint256 Type, uint256 Start, uint256 End, bool Closed, string Announcement, string Link, bool Opposited, string _str, uint256 _uint, address _addr) {
|
||||
function Announcements(uint256 id) public view returns (uint256 Type, uint256 Start, uint256 End, bool Closed, string memory Announcement, string memory Link, bool Opposited, string memory _str, uint256 _uint, address _addr) {
|
||||
/*
|
||||
Announcement data query
|
||||
|
||||
|
||||
@@ -174,7 +174,7 @@ contract schelling is module, announcementTypes, schellingVars {
|
||||
function setFunds(address addr, uint256 amount) internal {
|
||||
require( db.setFunds(addr, amount) );
|
||||
}
|
||||
function setVoter(address owner, _voter voter) internal {
|
||||
function setVoter(address owner, _voter memory voter) internal {
|
||||
require( db.setVoter(owner,
|
||||
voter.roundID,
|
||||
voter.hash,
|
||||
@@ -182,13 +182,13 @@ contract schelling is module, announcementTypes, schellingVars {
|
||||
voter.voteResult,
|
||||
voter.rewards
|
||||
) );
|
||||
}
|
||||
function getVoter(address addr) internal view returns (_voter) {
|
||||
}
|
||||
function getVoter(address addr) internal view returns (_voter memory) {
|
||||
(bool a, uint256 b, bytes32 c, schellingVars.voterStatus d, bool e, uint256 f) = db.getVoter(addr);
|
||||
require( a );
|
||||
return _voter(b, c, d, e, f);
|
||||
}
|
||||
function setRound(uint256 id, _rounds round) internal {
|
||||
function setRound(uint256 id, _rounds memory round) internal {
|
||||
require( db.setRound(id,
|
||||
round.totalAboveWeight,
|
||||
round.totalBelowWeight,
|
||||
@@ -197,8 +197,8 @@ contract schelling is module, announcementTypes, schellingVars {
|
||||
round.voted
|
||||
) );
|
||||
}
|
||||
function pushRound(_rounds round) internal returns (uint256) {
|
||||
(bool a, uint256 b) = db.pushRound(
|
||||
function pushRound(_rounds memory round) internal returns (uint256) {
|
||||
(bool a, uint256 b) = db.pushRound(
|
||||
round.totalAboveWeight,
|
||||
round.totalBelowWeight,
|
||||
round.reward,
|
||||
@@ -208,7 +208,7 @@ contract schelling is module, announcementTypes, schellingVars {
|
||||
require( a );
|
||||
return b;
|
||||
}
|
||||
function getRound(uint256 id) internal returns (_rounds) {
|
||||
function getRound(uint256 id) internal returns (_rounds memory) {
|
||||
(bool a, uint256 b, uint256 c, uint256 d, uint256 e, bool f) = db.getRound(id);
|
||||
require( a );
|
||||
return _rounds(b, c, d, e, f);
|
||||
@@ -529,7 +529,7 @@ contract schelling is module, announcementTypes, schellingVars {
|
||||
return belowW;
|
||||
}
|
||||
}
|
||||
function isWinner(_rounds round, bool aboveVote) internal returns (bool) {
|
||||
function isWinner(_rounds memory round, bool aboveVote) internal returns (bool) {
|
||||
/*
|
||||
Inside function for calculating the result of the game.
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ contract token is safeMath, module, announcementTypes {
|
||||
|
||||
mapping(address => bool) public genesis;
|
||||
|
||||
constructor(bool forReplace, address moduleHandler, address dbAddr, address icoContractAddr, address exchangeContractAddress, address[] genesisAddr, uint256[] genesisValue) public payable {
|
||||
constructor(bool forReplace, address moduleHandler, address dbAddr, address icoContractAddr, address exchangeContractAddress, address[] memory genesisAddr, uint256[] memory genesisValue) public payable {
|
||||
/*
|
||||
Installation function
|
||||
|
||||
@@ -288,7 +288,7 @@ contract token is safeMath, module, announcementTypes {
|
||||
return true;
|
||||
}
|
||||
|
||||
function _transferToContract(address from, address to, uint256 amount, bytes extraData) internal {
|
||||
function _transferToContract(address from, address to, uint256 amount, bytes memory extraData) internal {
|
||||
/*
|
||||
Internal function to start transactions to a contract
|
||||
|
||||
|
||||
@@ -101,7 +101,7 @@ contract Event {
|
||||
function getOutcomeTokens()
|
||||
public
|
||||
view
|
||||
returns (OutcomeToken[])
|
||||
returns (OutcomeToken[] memory)
|
||||
{
|
||||
return outcomeTokens;
|
||||
}
|
||||
@@ -111,7 +111,7 @@ contract Event {
|
||||
function getOutcomeTokenDistribution(address owner)
|
||||
public
|
||||
view
|
||||
returns (uint[] outcomeTokenDistribution)
|
||||
returns (uint[] memory outcomeTokenDistribution)
|
||||
{
|
||||
outcomeTokenDistribution = new uint[](outcomeTokens.length);
|
||||
for (uint8 i = 0; i < outcomeTokenDistribution.length; i++)
|
||||
|
||||
@@ -108,7 +108,7 @@ contract LMSRMarketMaker is MarketMaker {
|
||||
/// @param netOutcomeTokensSold Net outcome tokens sold by market
|
||||
/// @param funding Initial funding for market
|
||||
/// @return Cost level
|
||||
function calcCostLevel(int logN, int[] netOutcomeTokensSold, uint funding)
|
||||
function calcCostLevel(int logN, int[] memory netOutcomeTokensSold, uint funding)
|
||||
private
|
||||
view
|
||||
returns(int costLevel)
|
||||
@@ -129,7 +129,7 @@ contract LMSRMarketMaker is MarketMaker {
|
||||
/// @param funding Initial funding for market
|
||||
/// @param outcomeIndex Index of exponential term to extract (for use by marginal price function)
|
||||
/// @return A result structure composed of the sum, the offset used, and the summand associated with the supplied index
|
||||
function sumExpOffset(int logN, int[] netOutcomeTokensSold, uint funding, uint8 outcomeIndex)
|
||||
function sumExpOffset(int logN, int[] memory netOutcomeTokensSold, uint funding, uint8 outcomeIndex)
|
||||
private
|
||||
view
|
||||
returns (uint sum, int offset, uint outcomeExpTerm)
|
||||
@@ -171,7 +171,7 @@ contract LMSRMarketMaker is MarketMaker {
|
||||
function getNetOutcomeTokensSold(Market market)
|
||||
private
|
||||
view
|
||||
returns (int[] quantities)
|
||||
returns (int[] memory quantities)
|
||||
{
|
||||
quantities = new int[](market.eventContract().getOutcomeCount());
|
||||
for (uint8 i = 0; i < quantities.length; i++)
|
||||
|
||||
@@ -34,7 +34,7 @@ contract CentralizedOracle is Oracle {
|
||||
*/
|
||||
/// @dev Constructor sets owner address and IPFS hash
|
||||
/// @param _ipfsHash Hash identifying off chain event description
|
||||
constructor(address _owner, bytes _ipfsHash)
|
||||
constructor(address _owner, bytes memory _ipfsHash)
|
||||
public
|
||||
{
|
||||
// Description hash cannot be null
|
||||
|
||||
@@ -17,7 +17,7 @@ contract CentralizedOracleFactory {
|
||||
/// @dev Creates a new centralized oracle contract
|
||||
/// @param ipfsHash Hash identifying off chain event description
|
||||
/// @return Oracle contract
|
||||
function createCentralizedOracle(bytes ipfsHash)
|
||||
function createCentralizedOracle(bytes memory ipfsHash)
|
||||
public
|
||||
returns (CentralizedOracle centralizedOracle)
|
||||
{
|
||||
|
||||
@@ -16,7 +16,7 @@ contract MajorityOracle is Oracle {
|
||||
*/
|
||||
/// @dev Allows to create an oracle for a majority vote based on other oracles
|
||||
/// @param _oracles List of oracles taking part in the majority vote
|
||||
constructor(Oracle[] _oracles)
|
||||
constructor(Oracle[] memory _oracles)
|
||||
public
|
||||
{
|
||||
// At least 2 oracles should be defined
|
||||
|
||||
@@ -17,7 +17,7 @@ contract MajorityOracleFactory {
|
||||
/// @dev Creates a new majority oracle contract
|
||||
/// @param oracles List of oracles taking part in the majority vote
|
||||
/// @return Oracle contract
|
||||
function createMajorityOracle(Oracle[] oracles)
|
||||
function createMajorityOracle(Oracle[] memory oracles)
|
||||
public
|
||||
returns (MajorityOracle majorityOracle)
|
||||
{
|
||||
|
||||
@@ -176,7 +176,7 @@ library Math {
|
||||
/// @dev Returns maximum of an array
|
||||
/// @param nums Numbers to look through
|
||||
/// @return Maximum number
|
||||
function max(int[] nums)
|
||||
function max(int[] memory nums)
|
||||
public
|
||||
pure
|
||||
returns (int max)
|
||||
|
||||
@@ -175,7 +175,7 @@ contract MilestoneTracker {
|
||||
/// uint reviewTime
|
||||
/// address paymentSource,
|
||||
/// bytes payData,
|
||||
function proposeMilestones(bytes _newMilestones
|
||||
function proposeMilestones(bytes memory _newMilestones
|
||||
) public onlyRecipient campaignNotCanceled {
|
||||
proposedMilestones = _newMilestones;
|
||||
changingMilestones = true;
|
||||
|
||||
@@ -63,7 +63,7 @@ library strings {
|
||||
* @param self The string to make a slice from.
|
||||
* @return A newly allocated slice containing the entire string.
|
||||
*/
|
||||
function toSlice(string self) internal returns (slice) {
|
||||
function toSlice(string memory self) internal returns (slice memory) {
|
||||
uint ptr;
|
||||
assembly {
|
||||
ptr := add(self, 0x20)
|
||||
@@ -109,7 +109,7 @@ library strings {
|
||||
* @return A new slice containing the value of the input argument up to the
|
||||
* first null.
|
||||
*/
|
||||
function toSliceB32(bytes32 self) internal returns (slice ret) {
|
||||
function toSliceB32(bytes32 self) internal returns (slice memory ret) {
|
||||
// Allocate space for `self` in memory, copy it there, and point ret at it
|
||||
assembly {
|
||||
let ptr := mload(0x40)
|
||||
@@ -125,7 +125,7 @@ library strings {
|
||||
* @param self The slice to copy.
|
||||
* @return A new slice containing the same data as `self`.
|
||||
*/
|
||||
function copy(slice self) internal returns (slice) {
|
||||
function copy(slice memory self) internal returns (slice memory) {
|
||||
return slice(self._len, self._ptr);
|
||||
}
|
||||
|
||||
@@ -134,7 +134,7 @@ library strings {
|
||||
* @param self The slice to copy.
|
||||
* @return A newly allocated string containing the slice's text.
|
||||
*/
|
||||
function toString(slice self) internal returns (string) {
|
||||
function toString(slice memory self) internal returns (string memory) {
|
||||
string memory ret = new string(self._len);
|
||||
uint retptr;
|
||||
assembly { retptr := add(ret, 32) }
|
||||
@@ -151,7 +151,7 @@ library strings {
|
||||
* @param self The slice to operate on.
|
||||
* @return The length of the slice in runes.
|
||||
*/
|
||||
function len(slice self) internal returns (uint) {
|
||||
function len(slice memory self) internal returns (uint) {
|
||||
// Starting at ptr-31 means the LSB will be the byte we care about
|
||||
uint ptr = self._ptr - 31;
|
||||
uint end = ptr + self._len;
|
||||
@@ -181,7 +181,7 @@ library strings {
|
||||
* @param self The slice to operate on.
|
||||
* @return True if the slice is empty, False otherwise.
|
||||
*/
|
||||
function empty(slice self) internal returns (bool) {
|
||||
function empty(slice memory self) internal returns (bool) {
|
||||
return self._len == 0;
|
||||
}
|
||||
|
||||
@@ -194,7 +194,7 @@ library strings {
|
||||
* @param other The second slice to compare.
|
||||
* @return The result of the comparison.
|
||||
*/
|
||||
function compare(slice self, slice other) internal returns (int) {
|
||||
function compare(slice memory self, slice memory other) internal returns (int) {
|
||||
uint shortest = self._len;
|
||||
if (other._len < self._len)
|
||||
shortest = other._len;
|
||||
@@ -227,7 +227,7 @@ library strings {
|
||||
* @param self The second slice to compare.
|
||||
* @return True if the slices are equal, false otherwise.
|
||||
*/
|
||||
function equals(slice self, slice other) internal returns (bool) {
|
||||
function equals(slice memory self, slice memory other) internal returns (bool) {
|
||||
return compare(self, other) == 0;
|
||||
}
|
||||
|
||||
@@ -238,7 +238,7 @@ library strings {
|
||||
* @param rune The slice that will contain the first rune.
|
||||
* @return `rune`.
|
||||
*/
|
||||
function nextRune(slice self, slice rune) internal returns (slice) {
|
||||
function nextRune(slice memory self, slice memory rune) internal returns (slice memory) {
|
||||
rune._ptr = self._ptr;
|
||||
|
||||
if (self._len == 0) {
|
||||
@@ -280,7 +280,7 @@ library strings {
|
||||
* @param self The slice to operate on.
|
||||
* @return A slice containing only the first rune from `self`.
|
||||
*/
|
||||
function nextRune(slice self) internal returns (slice ret) {
|
||||
function nextRune(slice memory self) internal returns (slice memory ret) {
|
||||
nextRune(self, ret);
|
||||
}
|
||||
|
||||
@@ -289,7 +289,7 @@ library strings {
|
||||
* @param self The slice to operate on.
|
||||
* @return The number of the first codepoint in the slice.
|
||||
*/
|
||||
function ord(slice self) internal returns (uint ret) {
|
||||
function ord(slice memory self) internal returns (uint ret) {
|
||||
if (self._len == 0) {
|
||||
return 0;
|
||||
}
|
||||
@@ -338,7 +338,7 @@ library strings {
|
||||
* @param self The slice to hash.
|
||||
* @return The hash of the slice.
|
||||
*/
|
||||
function keccak(slice self) internal returns (bytes32 ret) {
|
||||
function keccak(slice memory self) internal returns (bytes32 ret) {
|
||||
assembly {
|
||||
ret := keccak256(mload(add(self, 32)), mload(self))
|
||||
}
|
||||
@@ -350,7 +350,7 @@ library strings {
|
||||
* @param needle The slice to search for.
|
||||
* @return True if the slice starts with the provided text, false otherwise.
|
||||
*/
|
||||
function startsWith(slice self, slice needle) internal returns (bool) {
|
||||
function startsWith(slice memory self, slice memory needle) internal returns (bool) {
|
||||
if (self._len < needle._len) {
|
||||
return false;
|
||||
}
|
||||
@@ -376,7 +376,7 @@ library strings {
|
||||
* @param needle The slice to search for.
|
||||
* @return `self`
|
||||
*/
|
||||
function beyond(slice self, slice needle) internal returns (slice) {
|
||||
function beyond(slice memory self, slice memory needle) internal returns (slice memory) {
|
||||
if (self._len < needle._len) {
|
||||
return self;
|
||||
}
|
||||
@@ -405,7 +405,7 @@ library strings {
|
||||
* @param needle The slice to search for.
|
||||
* @return True if the slice starts with the provided text, false otherwise.
|
||||
*/
|
||||
function endsWith(slice self, slice needle) internal returns (bool) {
|
||||
function endsWith(slice memory self, slice memory needle) internal returns (bool) {
|
||||
if (self._len < needle._len) {
|
||||
return false;
|
||||
}
|
||||
@@ -433,7 +433,7 @@ library strings {
|
||||
* @param needle The slice to search for.
|
||||
* @return `self`
|
||||
*/
|
||||
function until(slice self, slice needle) internal returns (slice) {
|
||||
function until(slice memory self, slice memory needle) internal returns (slice memory) {
|
||||
if (self._len < needle._len) {
|
||||
return self;
|
||||
}
|
||||
@@ -542,7 +542,7 @@ library strings {
|
||||
* @param needle The text to search for.
|
||||
* @return `self`.
|
||||
*/
|
||||
function find(slice self, slice needle) internal returns (slice) {
|
||||
function find(slice memory self, slice memory needle) internal returns (slice memory) {
|
||||
uint ptr = findPtr(self._len, self._ptr, needle._len, needle._ptr);
|
||||
self._len -= ptr - self._ptr;
|
||||
self._ptr = ptr;
|
||||
@@ -557,7 +557,7 @@ library strings {
|
||||
* @param needle The text to search for.
|
||||
* @return `self`.
|
||||
*/
|
||||
function rfind(slice self, slice needle) internal returns (slice) {
|
||||
function rfind(slice memory self, slice memory needle) internal returns (slice memory) {
|
||||
uint ptr = rfindPtr(self._len, self._ptr, needle._len, needle._ptr);
|
||||
self._len = ptr - self._ptr;
|
||||
return self;
|
||||
@@ -573,7 +573,7 @@ library strings {
|
||||
* @param token An output parameter to which the first token is written.
|
||||
* @return `token`.
|
||||
*/
|
||||
function split(slice self, slice needle, slice token) internal returns (slice) {
|
||||
function split(slice memory self, slice memory needle, slice memory token) internal returns (slice memory) {
|
||||
uint ptr = findPtr(self._len, self._ptr, needle._len, needle._ptr);
|
||||
token._ptr = self._ptr;
|
||||
token._len = ptr - self._ptr;
|
||||
@@ -596,7 +596,7 @@ library strings {
|
||||
* @param needle The text to search for in `self`.
|
||||
* @return The part of `self` up to the first occurrence of `delim`.
|
||||
*/
|
||||
function split(slice self, slice needle) internal returns (slice token) {
|
||||
function split(slice memory self, slice memory needle) internal returns (slice memory token) {
|
||||
split(self, needle, token);
|
||||
}
|
||||
|
||||
@@ -610,7 +610,7 @@ library strings {
|
||||
* @param token An output parameter to which the first token is written.
|
||||
* @return `token`.
|
||||
*/
|
||||
function rsplit(slice self, slice needle, slice token) internal returns (slice) {
|
||||
function rsplit(slice memory self, slice memory needle, slice memory token) internal returns (slice memory) {
|
||||
uint ptr = rfindPtr(self._len, self._ptr, needle._len, needle._ptr);
|
||||
token._ptr = ptr;
|
||||
token._len = self._len - (ptr - self._ptr);
|
||||
@@ -632,7 +632,7 @@ library strings {
|
||||
* @param needle The text to search for in `self`.
|
||||
* @return The part of `self` after the last occurrence of `delim`.
|
||||
*/
|
||||
function rsplit(slice self, slice needle) internal returns (slice token) {
|
||||
function rsplit(slice memory self, slice memory needle) internal returns (slice memory token) {
|
||||
rsplit(self, needle, token);
|
||||
}
|
||||
|
||||
@@ -642,7 +642,7 @@ library strings {
|
||||
* @param needle The text to search for in `self`.
|
||||
* @return The number of occurrences of `needle` found in `self`.
|
||||
*/
|
||||
function count(slice self, slice needle) internal returns (uint count) {
|
||||
function count(slice memory self, slice memory needle) internal returns (uint count) {
|
||||
uint ptr = findPtr(self._len, self._ptr, needle._len, needle._ptr) + needle._len;
|
||||
while (ptr <= self._ptr + self._len) {
|
||||
count++;
|
||||
@@ -656,7 +656,7 @@ library strings {
|
||||
* @param needle The text to search for in `self`.
|
||||
* @return True if `needle` is found in `self`, false otherwise.
|
||||
*/
|
||||
function contains(slice self, slice needle) internal returns (bool) {
|
||||
function contains(slice memory self, slice memory needle) internal returns (bool) {
|
||||
return rfindPtr(self._len, self._ptr, needle._len, needle._ptr) != self._ptr;
|
||||
}
|
||||
|
||||
@@ -667,7 +667,7 @@ library strings {
|
||||
* @param other The second slice to concatenate.
|
||||
* @return The concatenation of the two strings.
|
||||
*/
|
||||
function concat(slice self, slice other) internal returns (string) {
|
||||
function concat(slice memory self, slice memory other) internal returns (string memory) {
|
||||
string memory ret = new string(self._len + other._len);
|
||||
uint retptr;
|
||||
assembly { retptr := add(ret, 32) }
|
||||
@@ -684,7 +684,7 @@ library strings {
|
||||
* @return A newly allocated string containing all the slices in `parts`,
|
||||
* joined with `self`.
|
||||
*/
|
||||
function join(slice self, slice[] parts) internal returns (string) {
|
||||
function join(slice memory self, slice[] memory parts) internal returns (string memory) {
|
||||
if (parts.length == 0)
|
||||
return "";
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ contract MultisigWallet is Multisig, Shareable, DayLimit {
|
||||
* @param _owners A list of owners.
|
||||
* @param _required The amount required for a transaction to be approved.
|
||||
*/
|
||||
constructor(address[] _owners, uint256 _required, uint256 _daylimit)
|
||||
constructor(address[] memory _owners, uint256 _required, uint256 _daylimit)
|
||||
Shareable(_owners, _required)
|
||||
DayLimit(_daylimit) public { }
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ contract TokenDestructible is Ownable {
|
||||
* @notice The called token contracts could try to re-enter this contract. Only
|
||||
supply token contracts you trust.
|
||||
*/
|
||||
function destroy(address[] tokens) public onlyOwner {
|
||||
function destroy(address[] memory tokens) public onlyOwner {
|
||||
|
||||
// Transfer tokens to owner
|
||||
for(uint256 i = 0; i < tokens.length; i++) {
|
||||
|
||||
@@ -15,7 +15,7 @@ contract Contactable is Ownable{
|
||||
* @dev Allows the owner to set a string with their contact information.
|
||||
* @param info The contact information to attach to the contract.
|
||||
*/
|
||||
function setContactInformation(string info) public onlyOwner{
|
||||
function setContactInformation(string memory info) public onlyOwner{
|
||||
contactInformation = info;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ contract Shareable {
|
||||
* @param _owners A list of owners.
|
||||
* @param _required The amount required for a transaction to be approved.
|
||||
*/
|
||||
constructor(address[] _owners, uint256 _required) public {
|
||||
constructor(address[] memory _owners, uint256 _required) public {
|
||||
owners[1] = msg.sender;
|
||||
ownerIndex[msg.sender] = 1;
|
||||
for (uint256 i = 0; i < _owners.length; ++i) {
|
||||
|
||||
@@ -212,7 +212,7 @@ contract VestedToken is StandardToken, LimitedTransferToken {
|
||||
* @param time The time to be checked
|
||||
* @return An uint256 representing the amount of vested tokens of a specific grant at a specific time.
|
||||
*/
|
||||
function vestedTokens(TokenGrant grant, uint64 time) private view returns (uint256) {
|
||||
function vestedTokens(TokenGrant memory grant, uint64 time) private view returns (uint256) {
|
||||
return calculateVestedTokens(
|
||||
grant.value,
|
||||
uint256(time),
|
||||
@@ -229,7 +229,7 @@ contract VestedToken is StandardToken, LimitedTransferToken {
|
||||
* @return An uint256 representing the amount of non vested tokens of a specific grant on the
|
||||
* passed time frame.
|
||||
*/
|
||||
function nonVestedTokens(TokenGrant grant, uint64 time) private view returns (uint256) {
|
||||
function nonVestedTokens(TokenGrant memory grant, uint64 time) private view returns (uint256) {
|
||||
return grant.value.sub(vestedTokens(grant, time));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user