Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
6e63898d
Commit
6e63898d
authored
Jul 18, 2023
by
Mark Tyneway
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Downgrade Solidity to 0.8.14"
This reverts commit 77d445f7a5a8e0b7ab5fb026e7336017ea976233.
parent
3a0c60f7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
12 deletions
+15
-12
EAS.sol
packages/contracts-bedrock/contracts/EAS/EAS.sol
+11
-8
SchemaRegistry.sol
packages/contracts-bedrock/contracts/EAS/SchemaRegistry.sol
+2
-2
EIP712Verifier.sol
...contracts-bedrock/contracts/EAS/eip712/EIP712Verifier.sol
+1
-1
SchemaResolver.sol
...ntracts-bedrock/contracts/EAS/resolver/SchemaResolver.sol
+1
-1
No files found.
packages/contracts-bedrock/contracts/EAS/EAS.sol
View file @
6e63898d
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: MIT
pragma solidity 0.8.1
5
;
pragma solidity 0.8.1
9
;
import { Address } from "@openzeppelin/contracts/utils/Address.sol";
import { Address } from "@openzeppelin/contracts/utils/Address.sol";
...
@@ -70,14 +70,17 @@ contract EAS is IEAS, Semver, EIP712Verifier {
...
@@ -70,14 +70,17 @@ contract EAS is IEAS, Semver, EIP712Verifier {
error NotPayable();
error NotPayable();
error WrongSchema();
error WrongSchema();
// The global schema registry.
ISchemaRegistry private constant _schemaRegistry = ISchemaRegistry(Predeploys.SCHEMA_REGISTRY);
// The global mapping between attestations and their UIDs.
// The global mapping between attestations and their UIDs.
mapping(bytes32
=> A
ttestation) private _db;
mapping(bytes32
uid => Attestation a
ttestation) private _db;
// The global mapping between data and their timestamps.
// The global mapping between data and their timestamps.
mapping(bytes32
=> uint64
) private _timestamps;
mapping(bytes32
data => uint64 timestamp
) private _timestamps;
// The global mapping between data and their revocation timestamps.
// The global mapping between data and their revocation timestamps.
mapping(address
=> mapping(bytes32 => uint64
)) private _revocationsOffchain;
mapping(address
revoker => mapping(bytes32 data => uint64 timestamp
)) private _revocationsOffchain;
// Upgrade forward-compatibility storage gap
// Upgrade forward-compatibility storage gap
uint256[MAX_GAP - 3] private __gap;
uint256[MAX_GAP - 3] private __gap;
...
@@ -92,7 +95,7 @@ contract EAS is IEAS, Semver, EIP712Verifier {
...
@@ -92,7 +95,7 @@ contract EAS is IEAS, Semver, EIP712Verifier {
* @inheritdoc IEAS
* @inheritdoc IEAS
*/
*/
function getSchemaRegistry() external pure returns (ISchemaRegistry) {
function getSchemaRegistry() external pure returns (ISchemaRegistry) {
return
ISchemaRegistry(Predeploys.SCHEMA_REGISTRY)
;
return
_schemaRegistry
;
}
}
/**
/**
...
@@ -438,7 +441,7 @@ contract EAS is IEAS, Semver, EIP712Verifier {
...
@@ -438,7 +441,7 @@ contract EAS is IEAS, Semver, EIP712Verifier {
res.uids = new bytes32[](length);
res.uids = new bytes32[](length);
// Ensure that we aren't attempting to attest to a non-existing schema.
// Ensure that we aren't attempting to attest to a non-existing schema.
SchemaRecord memory schemaRecord =
ISchemaRegistry(Predeploys.SCHEMA_REGISTRY)
.getSchema(schema);
SchemaRecord memory schemaRecord =
_schemaRegistry
.getSchema(schema);
if (schemaRecord.uid == EMPTY_UID) {
if (schemaRecord.uid == EMPTY_UID) {
revert InvalidSchema();
revert InvalidSchema();
}
}
...
@@ -528,7 +531,7 @@ contract EAS is IEAS, Semver, EIP712Verifier {
...
@@ -528,7 +531,7 @@ contract EAS is IEAS, Semver, EIP712Verifier {
bool last
bool last
) private returns (uint256) {
) private returns (uint256) {
// Ensure that a non-existing schema ID wasn't passed by accident.
// Ensure that a non-existing schema ID wasn't passed by accident.
SchemaRecord memory schemaRecord =
ISchemaRegistry(Predeploys.SCHEMA_REGISTRY)
.getSchema(schema);
SchemaRecord memory schemaRecord =
_schemaRegistry
.getSchema(schema);
if (schemaRecord.uid == EMPTY_UID) {
if (schemaRecord.uid == EMPTY_UID) {
revert InvalidSchema();
revert InvalidSchema();
}
}
...
@@ -774,7 +777,7 @@ contract EAS is IEAS, Semver, EIP712Verifier {
...
@@ -774,7 +777,7 @@ contract EAS is IEAS, Semver, EIP712Verifier {
* @param time The timestamp.
* @param time The timestamp.
*/
*/
function _revokeOffchain(address revoker, bytes32 data, uint64 time) private {
function _revokeOffchain(address revoker, bytes32 data, uint64 time) private {
mapping(bytes32
=> uint64
) storage revocations = _revocationsOffchain[revoker];
mapping(bytes32
data => uint64 timestamp
) storage revocations = _revocationsOffchain[revoker];
if (revocations[data] != 0) {
if (revocations[data] != 0) {
revert AlreadyRevokedOffchain();
revert AlreadyRevokedOffchain();
...
...
packages/contracts-bedrock/contracts/EAS/SchemaRegistry.sol
View file @
6e63898d
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: MIT
pragma solidity 0.8.1
5
;
pragma solidity 0.8.1
9
;
import { Semver } from "../universal/Semver.sol";
import { Semver } from "../universal/Semver.sol";
...
@@ -17,7 +17,7 @@ contract SchemaRegistry is ISchemaRegistry, Semver {
...
@@ -17,7 +17,7 @@ contract SchemaRegistry is ISchemaRegistry, Semver {
error AlreadyExists();
error AlreadyExists();
// The global mapping between schema records and their IDs.
// The global mapping between schema records and their IDs.
mapping(bytes32
=> S
chemaRecord) private _registry;
mapping(bytes32
uid => SchemaRecord s
chemaRecord) private _registry;
// Upgrade forward-compatibility storage gap
// Upgrade forward-compatibility storage gap
uint256[MAX_GAP - 1] private __gap;
uint256[MAX_GAP - 1] private __gap;
...
...
packages/contracts-bedrock/contracts/EAS/eip712/EIP712Verifier.sol
View file @
6e63898d
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: MIT
pragma solidity 0.8.1
5
;
pragma solidity 0.8.1
9
;
import { EIP712 } from "@openzeppelin/contracts/utils/cryptography/draft-EIP712.sol";
import { EIP712 } from "@openzeppelin/contracts/utils/cryptography/draft-EIP712.sol";
import { ECDSA } from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
import { ECDSA } from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
...
...
packages/contracts-bedrock/contracts/EAS/resolver/SchemaResolver.sol
View file @
6e63898d
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: MIT
pragma solidity 0.8.1
5
;
pragma solidity 0.8.1
9
;
import { Semver } from "../../universal/Semver.sol";
import { Semver } from "../../universal/Semver.sol";
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment