Skip to content

Commit 114d409

Browse files
authored
Merge pull request #247 from MoMannn/solidity-0.8.x
Update solidity to 0.8.0.
2 parents c4e810d + 7696589 commit 114d409

27 files changed

+1825
-1447
lines changed

.solhint.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
{
22
"extends": "solhint:default",
33
"rules": {
4-
"indent": ["error", 2],
5-
"bracket-align": "off",
6-
"two-lines-top-level-separator": "off",
7-
"max-line-length": 100
4+
"max-line-length": ["warn", 100]
85
}
96
}

CONTRIBUTING.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ The full style guide is available [here](https://github.com/0xcert/solidity-styl
1818

1919
The release manager is responsible to follow this process for each release of this project.
2020

21-
1. Confirm that the [version we reference](https://github.com/0xcert/ethereum-erc721/blob/master/src/contracts/math/safe-math.sol) for SafeMath is the [latest released version](https://github.com/0xcert/framework/tree/master/packages/0xcert-ethereum-utils-contracts/src/contracts/math).
22-
2. Summarize the changes and create a release using [GitHub releases](https://github.com/0xcert/solidity-style-guide/releases).
23-
3. Create a branch/pull request against https://github.com/0xcert/framework/tree/master/packages/0xcert-ethereum-erc721-contracts for any relevant changes since the last release here
21+
1. Summarize the changes and create a release using [GitHub releases](https://github.com/0xcert/solidity-style-guide/releases).
22+
2. Create a branch/pull request against https://github.com/0xcert/framework/tree/master/packages/0xcert-ethereum-erc721-contracts for any relevant changes since the last release here
2423

2524
```
2625
$ npm i

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ You have created and have possession of unique glass-blown artwork (each having
7777
To do this, simply paste the code below into Remix and deploy the smart contract. You will "mint" a token for each new piece of artwork you want to see. Then you will "burn" that token when you surrender physical possession of the piece.
7878

7979
```solidity
80-
pragma solidity 0.6.2;
80+
pragma solidity 0.8.0;
8181
8282
import "https://github.com/0xcert/ethereum-erc721/src/contracts/tokens/nf-token-metadata.sol";
8383
import "https://github.com/0xcert/ethereum-erc721/src/contracts/ownership/ownable.sol";

package-lock.json

Lines changed: 1758 additions & 1227 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@
6868
"standard"
6969
],
7070
"devDependencies": {
71-
"@specron/cli": "0.15.1",
72-
"@specron/flattener": "0.15.1",
73-
"@specron/spec": "0.15.1",
74-
"@types/node": "13.7.0",
75-
"solc": "0.6.2",
76-
"solhint": "2.3.0",
77-
"ts-node": "8.6.2",
78-
"typescript": "3.7.5",
79-
"web3": "1.2.5-rc.0"
71+
"@specron/cli": "0.17.1",
72+
"@specron/flattener": "0.17.1",
73+
"@specron/spec": "0.17.1",
74+
"@types/node": "14.14.20",
75+
"solc": "0.8.0",
76+
"solhint": "3.3.2",
77+
"ts-node": "9.1.1",
78+
"typescript": "4.1.3",
79+
"web3": "1.3.1"
8080
}
8181
}

src/contracts/math/safe-math.sol

Lines changed: 0 additions & 119 deletions
This file was deleted.

src/contracts/mocks/nf-token-enumerable-mock.sol

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
pragma solidity 0.6.2;
1+
// SPDX-License-Identifier: MIT
2+
pragma solidity 0.8.0;
23

34
import "../../contracts/tokens/nf-token-enumerable.sol";
45
import "../ownership/ownable.sol";

src/contracts/mocks/nf-token-metadata-enumerable-mock.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
pragma solidity 0.6.2;
1+
// SPDX-License-Identifier: MIT
2+
pragma solidity 0.8.0;
23

34
import "../tokens/nf-token-metadata.sol";
45
import "../tokens/nf-token-enumerable.sol";
@@ -23,7 +24,6 @@ contract NFTokenMetadataEnumerableMock is
2324
string memory _name,
2425
string memory _symbol
2526
)
26-
public
2727
{
2828
nftName = _name;
2929
nftSymbol = _symbol;

src/contracts/mocks/nf-token-metadata-mock.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
pragma solidity 0.6.2;
1+
// SPDX-License-Identifier: MIT
2+
pragma solidity 0.8.0;
23

34
import "../tokens/nf-token-metadata.sol";
45
import "../ownership/ownable.sol";
@@ -20,7 +21,6 @@ contract NFTokenMetadataMock is
2021
string memory _name,
2122
string memory _symbol
2223
)
23-
public
2424
{
2525
nftName = _name;
2626
nftSymbol = _symbol;

src/contracts/mocks/nf-token-mock.sol

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
pragma solidity 0.6.2;
1+
// SPDX-License-Identifier: MIT
2+
pragma solidity 0.8.0;
23

34
import "../../contracts/tokens/nf-token.sol";
45
import "../ownership/ownable.sol";

0 commit comments

Comments
 (0)