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
3b10eae3
Unverified
Commit
3b10eae3
authored
Sep 26, 2023
by
mergify[bot]
Committed by
GitHub
Sep 26, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into wyatt/ufm/gh-workflow-and-refactors
parents
95d9b246
aa92d998
Changes
9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
28 additions
and
25 deletions
+28
-25
eas.go
op-bindings/bindings/eas.go
+1
-1
eas_more.go
op-bindings/bindings/eas_more.go
+1
-1
schemaregistry.go
op-bindings/bindings/schemaregistry.go
+2
-2
schemaregistry_more.go
op-bindings/bindings/schemaregistry_more.go
+1
-1
semver-lock.json
packages/contracts-bedrock/semver-lock.json
+2
-2
EAS.sol
packages/contracts-bedrock/src/EAS/EAS.sol
+10
-7
IEAS.sol
packages/contracts-bedrock/src/EAS/IEAS.sol
+2
-2
ISchemaRegistry.sol
packages/contracts-bedrock/src/EAS/ISchemaRegistry.sol
+1
-1
SchemaRegistry.sol
packages/contracts-bedrock/src/EAS/SchemaRegistry.sol
+8
-8
No files found.
op-bindings/bindings/eas.go
View file @
3b10eae3
This diff is collapsed.
Click to expand it.
op-bindings/bindings/eas_more.go
View file @
3b10eae3
This diff is collapsed.
Click to expand it.
op-bindings/bindings/schemaregistry.go
View file @
3b10eae3
This diff is collapsed.
Click to expand it.
op-bindings/bindings/schemaregistry_more.go
View file @
3b10eae3
...
@@ -13,7 +13,7 @@ const SchemaRegistryStorageLayoutJSON = "{\"storage\":[{\"astId\":1000,\"contrac
...
@@ -13,7 +13,7 @@ const SchemaRegistryStorageLayoutJSON = "{\"storage\":[{\"astId\":1000,\"contrac
var
SchemaRegistryStorageLayout
=
new
(
solc
.
StorageLayout
)
var
SchemaRegistryStorageLayout
=
new
(
solc
.
StorageLayout
)
var
SchemaRegistryDeployedBin
=
"0x608060405234801561001057600080fd5b50600436106100415760003560e01c806354fd4d501461004657806360d7a278146100
64578063a2ea7c6e14610085575b600080fd5b61004e6100a5565b60405161005b919061061f565b60405180910390f35b610077610072366004610639565b610148565b60405190815260200161005b565b6100986100933660046106eb565b61030c565b60405161005b9190610704565b60606100d07f0000000000000000000000000000000000000000000000000000000000000000610434565b6100f97f0000000000000000000000000000000000000000000000000000000000000000610434565b6101227f0000000000000000000000000000000000000000000000000000000000000000610434565b60405160200161013493929190610755565b604051602081830303815290604052905090565b60008060405180608001604052806000801b81526020018573ffffffffffffffffffffffffffffffffffffffff168152602001841515815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250939094525092935091506101ca905082610571565b60008181526020819052604090205490915015610213576040517f23369fa600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b80825260008181526020818152604091829020845181559084015160018201805493860151151574010000000000000000000000000000000000000000027fffffffffffffffffffffff00000000000000000000000000000000000000000090941673ffffffffffffffffffffffffffffffffffffffff9092169190911792909217909155606083015183919060028201906102af908261089c565b509050503373ffffffffffffffffffffffffffffffffffffffff16817fd0b86852e21f9e5fa4bc3b0cff9757ffe243d50c4b43968a42202153d651ea5e846040516102fa9190610704565b60405180910390a39695505050505050565b604080516080810182526000808252602082018190529181019190915260608082015260008281526020818152604091829020825160808101845281548152600182015473ffffffffffffffffffffffffffffffffffffffff8116938201939093527401000000000000000000000000000000000000000090920460ff161515928201929092526002820180549192916060840191906103ab906107fa565b80601f01602080910402602001604051908101604052809291908181526020018280546103d7906107fa565b80156104245780601f106103f957610100808354040283529160200191610424565b820191906000526020600020905b81548152906001019060200180831161040757829003601f168201915b5050505050815250509050919050565b60608160000361047757505060408051808201909152600181527f3000000000000000000000000000000000000000000000000000000000000000602082015290565b8160005b81156104a1578061048b816109e5565b915061049a9050600a83610a4c565b915061047b565b60008167ffffffffffffffff8111156104bc576104bc6107cb565b6040519080825280601f01601f1916602001820160405280156104e6576020820181803683370190505b5090505b8415610569576104fb600183610a60565b9150610508600a86610a79565b610513906030610a8d565b60f81b81838151811061052857610528610aa0565b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a905350610562600a86610a4c565b94506104ea565b949350505050565b600081606001518260200151836040015160405160200161059493929190610acf565b604051602081830303815290604052805190602001209050919050565b60005b838110156105cc5781810151838201526020016105b4565b50506000910152565b600081518084526105ed8160208601602086016105b1565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b60208152600061063260208301846105d5565b9392505050565b6000806000806060858703121561064f57600080fd5b843567ffffffffffffffff8082111561066757600080fd5b818701915087601f83011261067b57600080fd5b81358181111561068a57600080fd5b88602082850101111561069c57600080fd5b6020928301965094505085013573ffffffffffffffffffffffffffffffffffffffff811681146106cb57600080fd5b9150604085013580151581146106e057600080fd5b939692955090935050565b6000602082840312156106fd57600080fd5b5035919050565b602081528151602082015273ffffffffffffffffffffffffffffffffffffffff60208301511660408201526040820151151560608201526000606083015160808084015261056960a08401826105d5565b600084516107678184602089016105b1565b80830190507f2e0000000000000000000000000000000000000000000000000000000000000080825285516107a3816001850160208a016105b1565b600192019182015283516107be8160028401602088016105b1565b0160020195945050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600181811c9082168061080e57607f821691505b602082108103610847577f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b50919050565b601f82111561089757600081815260208120601f850160051c810160208610156108745750805b601f850160051c820191505b8181101561089357828155600101610880565b5050505b505050565b815167ffffffffffffffff8111156108b6576108b66107cb565b6108ca816108c484546107fa565b8461084d565b602080601f83116001811461091d57600084156108e75750858301515b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600386901b1c1916600185901b178555610893565b6000858152602081207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08616915b8281101561096a5788860151825594840194600190910190840161094b565b50858210156109a657878501517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600388901b60f8161c191681555b5050505050600190811b01905550565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203610a1657610a166109b6565b5060010190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600082610a5b57610a5b610a1d565b500490565b81810381811115610a7357610a736109b6565b92915050565b600082610a8857610a88610a1d565b500690565b80820180821115610a7357610a736109b6565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60008451610ae18184602089016105b1
565b60609490941b7fffffffffffffffffffffffffffffffffffffffff000000000000000000000000169190930190815290151560f81b60148201526015019291505056fea164736f6c6343000813000a"
var
SchemaRegistryDeployedBin
=
"0x608060405234801561001057600080fd5b50600436106100415760003560e01c806354fd4d501461004657806360d7a278146100
98578063a2ea7c6e146100b9575b600080fd5b6100826040518060400160405280600581526020017f312e332e3000000000000000000000000000000000000000000000000000000081525081565b60405161008f9190610473565b60405180910390f35b6100ab6100a636600461048d565b6100d9565b60405190815260200161008f565b6100cc6100c736600461053f565b61029d565b60405161008f9190610558565b60008060405180608001604052806000801b81526020018573ffffffffffffffffffffffffffffffffffffffff168152602001841515815260200187878080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201829052509390945250929350915061015b9050826103c5565b600081815260208190526040902054909150156101a4576040517f23369fa600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b80825260008181526020818152604091829020845181559084015160018201805493860151151574010000000000000000000000000000000000000000027fffffffffffffffffffffff00000000000000000000000000000000000000000090941673ffffffffffffffffffffffffffffffffffffffff9092169190911792909217909155606083015183919060028201906102409082610682565b509050503373ffffffffffffffffffffffffffffffffffffffff16817fd0b86852e21f9e5fa4bc3b0cff9757ffe243d50c4b43968a42202153d651ea5e8460405161028b9190610558565b60405180910390a39695505050505050565b604080516080810182526000808252602082018190529181019190915260608082015260008281526020818152604091829020825160808101845281548152600182015473ffffffffffffffffffffffffffffffffffffffff8116938201939093527401000000000000000000000000000000000000000090920460ff1615159282019290925260028201805491929160608401919061033c906105e0565b80601f0160208091040260200160405190810160405280929190818152602001828054610368906105e0565b80156103b55780601f1061038a576101008083540402835291602001916103b5565b820191906000526020600020905b81548152906001019060200180831161039857829003601f168201915b5050505050815250509050919050565b60008160600151826020015183604001516040516020016103e89392919061079c565b604051602081830303815290604052805190602001209050919050565b60005b83811015610420578181015183820152602001610408565b50506000910152565b60008151808452610441816020860160208601610405565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b6020815260006104866020830184610429565b9392505050565b600080600080606085870312156104a357600080fd5b843567ffffffffffffffff808211156104bb57600080fd5b818701915087601f8301126104cf57600080fd5b8135818111156104de57600080fd5b8860208285010111156104f057600080fd5b6020928301965094505085013573ffffffffffffffffffffffffffffffffffffffff8116811461051f57600080fd5b91506040850135801515811461053457600080fd5b939692955090935050565b60006020828403121561055157600080fd5b5035919050565b602081528151602082015273ffffffffffffffffffffffffffffffffffffffff6020830151166040820152604082015115156060820152600060608301516080808401526105a960a0840182610429565b949350505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600181811c908216806105f457607f821691505b60208210810361062d577f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b50919050565b601f82111561067d57600081815260208120601f850160051c8101602086101561065a5750805b601f850160051c820191505b8181101561067957828155600101610666565b5050505b505050565b815167ffffffffffffffff81111561069c5761069c6105b1565b6106b0816106aa84546105e0565b84610633565b602080601f83116001811461070357600084156106cd5750858301515b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600386901b1c1916600185901b178555610679565b6000858152602081207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08616915b8281101561075057888601518255948401946001909101908401610731565b508582101561078c57878501517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600388901b60f8161c191681555b5050505050600190811b01905550565b600084516107ae818460208901610405
565b60609490941b7fffffffffffffffffffffffffffffffffffffffff000000000000000000000000169190930190815290151560f81b60148201526015019291505056fea164736f6c6343000813000a"
func
init
()
{
func
init
()
{
if
err
:=
json
.
Unmarshal
([]
byte
(
SchemaRegistryStorageLayoutJSON
),
SchemaRegistryStorageLayout
);
err
!=
nil
{
if
err
:=
json
.
Unmarshal
([]
byte
(
SchemaRegistryStorageLayoutJSON
),
SchemaRegistryStorageLayout
);
err
!=
nil
{
...
...
packages/contracts-bedrock/semver-lock.json
View file @
3b10eae3
{
{
"src/EAS/EAS.sol"
:
"0x
1acb25751a1206eb859cc5fcf934da2f84cfb907b8e8951d86fc4e43c53a730
3"
,
"src/EAS/EAS.sol"
:
"0x
ea04b7a9ec170ce9cbd466ede87650f9e9ffe3d725d7951cef5777a98a84017
3"
,
"src/EAS/SchemaRegistry.sol"
:
"0x
305f3afed2e337cd70aac70fc202e6503b947b0a31e0d4e18c49486eeb635bb5
"
,
"src/EAS/SchemaRegistry.sol"
:
"0x
5ee1a0c3b2bf1eb5edb53fb0967cf13856be546f0f16fe7acdc3e4f286db6831
"
,
"src/L1/DelayedVetoable.sol"
:
"0x276c6276292095e6aa37a70008cf4e0d1cbcc020dbc9107459bbc72ab5ed744f"
,
"src/L1/DelayedVetoable.sol"
:
"0x276c6276292095e6aa37a70008cf4e0d1cbcc020dbc9107459bbc72ab5ed744f"
,
"src/L1/L1CrossDomainMessenger.sol"
:
"0x14f5991022705b8bd3bf931e138a528cc9c9e90d0f1ec398efd5079224d61b3b"
,
"src/L1/L1CrossDomainMessenger.sol"
:
"0x14f5991022705b8bd3bf931e138a528cc9c9e90d0f1ec398efd5079224d61b3b"
,
"src/L1/L1ERC721Bridge.sol"
:
"0x3e0e3d2f4c151e41585850f06e6452cdda86348debfe6ff16e364a839266450b"
,
"src/L1/L1ERC721Bridge.sol"
:
"0x3e0e3d2f4c151e41585850f06e6452cdda86348debfe6ff16e364a839266450b"
,
...
...
packages/contracts-bedrock/src/EAS/EAS.sol
View file @
3b10eae3
...
@@ -2,10 +2,10 @@
...
@@ -2,10 +2,10 @@
pragma solidity 0.8.19;
pragma solidity 0.8.19;
import { Address } from "@openzeppelin/contracts/utils/Address.sol";
import { Address } from "@openzeppelin/contracts/utils/Address.sol";
import {
Semver } from "../universal/
Semver.sol";
import {
ISemver } from "src/universal/I
Semver.sol";
import { Predeploys } from "
..
/libraries/Predeploys.sol";
import { Predeploys } from "
src
/libraries/Predeploys.sol";
import { EIP1271Verifier } from "
.
/eip1271/EIP1271Verifier.sol";
import { EIP1271Verifier } from "
src/EAS
/eip1271/EIP1271Verifier.sol";
import { ISchemaResolver } from "
.
/resolver/ISchemaResolver.sol";
import { ISchemaResolver } from "
src/EAS
/resolver/ISchemaResolver.sol";
import {
import {
AccessDenied,
AccessDenied,
...
@@ -44,7 +44,7 @@ struct AttestationsResult {
...
@@ -44,7 +44,7 @@ struct AttestationsResult {
/// @custom:predeploy 0x4200000000000000000000000000000000000021
/// @custom:predeploy 0x4200000000000000000000000000000000000021
/// @title EAS
/// @title EAS
/// @notice The Ethereum Attestation Service protocol.
/// @notice The Ethereum Attestation Service protocol.
contract EAS is IEAS, Semver, EIP1271Verifier {
contract EAS is IEAS,
I
Semver, EIP1271Verifier {
using Address for address payable;
using Address for address payable;
error AlreadyRevoked();
error AlreadyRevoked();
...
@@ -79,9 +79,12 @@ contract EAS is IEAS, Semver, EIP1271Verifier {
...
@@ -79,9 +79,12 @@ contract EAS is IEAS, Semver, EIP1271Verifier {
// Upgrade forward-compatibility storage gap
// Upgrade forward-compatibility storage gap
uint256[MAX_GAP - 3] private __gap;
uint256[MAX_GAP - 3] private __gap;
/// @notice Semantic version.
/// @custom:semver 1.3.0
string public constant version = "1.3.0";
/// @dev Creates a new EAS instance.
/// @dev Creates a new EAS instance.
/// @custom:semver 1.2.0
constructor() EIP1271Verifier("EAS", "1.2.0") { }
constructor() Semver(1, 2, 0) EIP1271Verifier("EAS", "1.2.0") { }
/// @inheritdoc IEAS
/// @inheritdoc IEAS
function getSchemaRegistry() external pure returns (ISchemaRegistry) {
function getSchemaRegistry() external pure returns (ISchemaRegistry) {
...
...
packages/contracts-bedrock/src/EAS/IEAS.sol
View file @
3b10eae3
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
pragma solidity ^0.8.0;
import { ISchemaRegistry } from "
.
/ISchemaRegistry.sol";
import { ISchemaRegistry } from "
src/EAS
/ISchemaRegistry.sol";
import { Attestation, Signature } from "
.
/Common.sol";
import { Attestation, Signature } from "
src/EAS
/Common.sol";
/// @dev A struct representing the arguments of the attestation request.
/// @dev A struct representing the arguments of the attestation request.
struct AttestationRequestData {
struct AttestationRequestData {
...
...
packages/contracts-bedrock/src/EAS/ISchemaRegistry.sol
View file @
3b10eae3
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
pragma solidity ^0.8.0;
import { ISchemaResolver } from "
.
/resolver/ISchemaResolver.sol";
import { ISchemaResolver } from "
src/EAS
/resolver/ISchemaResolver.sol";
/// @title A struct representing a record for a submitted schema.
/// @title A struct representing a record for a submitted schema.
struct SchemaRecord {
struct SchemaRecord {
...
...
packages/contracts-bedrock/src/EAS/SchemaRegistry.sol
View file @
3b10eae3
// SPDX-License-Identifier: MIT
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
pragma solidity 0.8.19;
import {
Semver } from "../universal/
Semver.sol";
import {
ISemver } from "src/universal/I
Semver.sol";
import { ISchemaResolver } from "
.
/resolver/ISchemaResolver.sol";
import { ISchemaResolver } from "
src/EAS
/resolver/ISchemaResolver.sol";
import { EMPTY_UID, MAX_GAP } from "
.
/Common.sol";
import { EMPTY_UID, MAX_GAP } from "
src/EAS
/Common.sol";
import { ISchemaRegistry, SchemaRecord } from "
.
/ISchemaRegistry.sol";
import { ISchemaRegistry, SchemaRecord } from "
src/EAS
/ISchemaRegistry.sol";
/// @custom:proxied
/// @custom:proxied
/// @custom:predeploy 0x4200000000000000000000000000000000000020
/// @custom:predeploy 0x4200000000000000000000000000000000000020
/// @title SchemaRegistry
/// @title SchemaRegistry
/// @notice The global attestation schemas for the Ethereum Attestation Service protocol.
/// @notice The global attestation schemas for the Ethereum Attestation Service protocol.
contract SchemaRegistry is ISchemaRegistry, Semver {
contract SchemaRegistry is ISchemaRegistry,
I
Semver {
error AlreadyExists();
error AlreadyExists();
// The global mapping between schema records and their IDs.
// The global mapping between schema records and their IDs.
...
@@ -19,9 +19,9 @@ contract SchemaRegistry is ISchemaRegistry, Semver {
...
@@ -19,9 +19,9 @@ contract SchemaRegistry is ISchemaRegistry, Semver {
// Upgrade forward-compatibility storage gap
// Upgrade forward-compatibility storage gap
uint256[MAX_GAP - 1] private __gap;
uint256[MAX_GAP - 1] private __gap;
/// @
dev Creates a new SchemaRegistry instance
.
/// @
notice Semantic version
.
/// @custom:semver 1.
2
.0
/// @custom:semver 1.
3
.0
constructor() Semver(1, 2, 0) { }
string public constant version = "1.3.0";
/// @inheritdoc ISchemaRegistry
/// @inheritdoc ISchemaRegistry
function register(string calldata schema, ISchemaResolver resolver, bool revocable) external returns (bytes32) {
function register(string calldata schema, ISchemaResolver resolver, bool revocable) external returns (bytes32) {
...
...
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