Skip to content

Commit 8e58a9e

Browse files
Integration aws nitro (#79)
* Update the EspressoTEEVerifierMock contract (#47) * Update the EspressoTEEVerifierMock contract * address comments * Fix Mock Contract (#51) * Fix Mock Contract * fix comment * Update sequencer inbox to check batcher signature (#53) * Update sequencer inbox to check batcher signature * fix build * fix tests * fix sequencer inbox test * update espresso tee contracts * remove unwanted files * address comments and fix tests * fix tests * Update to have AWS Nitro Contracts (#58) * start * remove forge and automata and remap to espresso tee * try remappings * add back * testing * Add `TeeType` to Inbox Contracts (#59) * start * remove forge and automata and remap to espresso tee * try remappings * add back * testing * add test files * encode tee type, add tests * Update TEE Repo to latest (#68) * update * update setup node, rename quote to espresso metadata * update tee (#69) * update contracts (#70) * comment out blobs for now * fix blobs for new espresso tee verifier * cherry-pick and fix tests --------- Co-authored-by: Sneh Koul <35871990+Sneh1999@users.noreply.github.com>
1 parent 6cf13fe commit 8e58a9e

24 files changed

+472
-544
lines changed

.github/workflows/contract-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ jobs:
215215
run: yarn
216216

217217
- name: Compile contracts
218-
run: yarn build
218+
run: yarn build:all
219219

220220
- name: Run e2e tests
221221
run: yarn test:e2e
@@ -262,7 +262,7 @@ jobs:
262262
run: yarn
263263

264264
- name: Compile contracts
265-
run: yarn build
265+
run: yarn build:all
266266

267267
- name: Run e2e tests
268268
run: yarn test:e2e
@@ -309,7 +309,7 @@ jobs:
309309
run: yarn
310310

311311
- name: Compile contracts
312-
run: yarn build
312+
run: yarn build:all
313313

314314
- name: Run e2e tests
315315
run: yarn test:e2e

.gitmodules

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "lib/forge-std"]
2-
path = lib/forge-std
3-
url = https://github.com/foundry-rs/forge-std
4-
[submodule "lib/automata-dcap-attestation"]
5-
path = lib/automata-dcap-attestation
6-
url = https://github.com/EspressoSystems/automata-dcap-attestation
1+
[submodule "lib/espresso-tee-contracts"]
2+
path = lib/espresso-tee-contracts
3+
url = https://github.com/EspressoSystems/espresso-tee-contracts

lib/automata-dcap-attestation

Lines changed: 0 additions & 1 deletion
This file was deleted.

lib/espresso-tee-contracts

Submodule espresso-tee-contracts added at 080c31e

lib/forge-std

Lines changed: 0 additions & 1 deletion
This file was deleted.

remappings.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
ds-test/=lib/forge-std/lib/ds-test/src/
2-
forge-std/=lib/forge-std/src/
1+
ds-test/=lib/espresso-tee-contracts/lib/forge-std/lib/ds-test/src/
2+
forge-std/=lib/espresso-tee-contracts/lib/forge-std/src/
33
openzeppelin-contracts/=node_modules/@openzeppelin/contracts/
44
@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
55
@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/
6-
@automata-network/dcap-attestation/contracts=lib/automata-dcap-attestation/contracts/
7-
@automata-network/dcap-attestation/test=lib/automata-dcap-attestation/forge-test/
8-
solady/=node_modules/solady/src/
6+
solady/=node_modules/solady/src/
7+
espresso-tee-contracts/=lib/espresso-tee-contracts/src/

src/bridge/EspressoTEEVerifier.sol

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

src/bridge/IEspressoTEEVerifier.sol

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

src/bridge/ISequencerInbox.sol

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ interface ISequencerInbox is IDelayedMessageProvider {
3939
/// @dev a keyset was invalidated
4040
event InvalidateKeyset(bytes32 indexed keysetHash);
4141

42-
/// @dev a TEE attestation quote was verified
43-
event TEEAttestationQuoteVerified(uint256 indexed seqMessageIndex);
42+
/// @dev Signature from a registered ephemeral key generated inside TEE was verified over the batch data hash
43+
event TEESignatureVerified(uint256 indexed sequenceNumber, uint256 indexed hotshotHeight);
4444

4545
function totalDelayedMessagesRead() external view returns (uint256);
4646

@@ -172,7 +172,7 @@ interface ISequencerInbox is IDelayedMessageProvider {
172172
IGasRefunder gasRefunder,
173173
uint256 prevMessageCount,
174174
uint256 newMessageCount,
175-
bytes memory quote
175+
bytes memory espressoMetadata
176176
) external;
177177

178178
function addSequencerL2Batch(
@@ -191,7 +191,7 @@ interface ISequencerInbox is IDelayedMessageProvider {
191191
IGasRefunder gasRefunder,
192192
uint256 prevMessageCount,
193193
uint256 newMessageCount,
194-
bytes memory quote
194+
bytes memory espressoMetadata
195195
) external;
196196

197197
function addSequencerL2BatchFromBlobs(
@@ -208,7 +208,7 @@ interface ISequencerInbox is IDelayedMessageProvider {
208208
IGasRefunder gasRefunder,
209209
uint256 prevMessageCount,
210210
uint256 newMessageCount,
211-
bytes memory quote
211+
bytes memory espressoMetadata
212212
) external;
213213

214214
// ---------- onlyRollupOrOwner functions ----------

0 commit comments

Comments
 (0)