Merge pull request #30 from EspressoSystems/jh/sync

Sync develop branch with recent commits

.env.sample.goerli

@@ -7,4 +7,22 @@ INFURA_KEY=""
 
 ## optional - address of already deployed ERC20 token which shall be used as rollup's fee token
 FEE_TOKEN_ADDRESS=""
-ESPRESSO_LIGHT_CLIENT_ADDRESS=""
+
+### Example TEE ATTESTATION CONTRACTS ###
+DCAP_IMAGE_ID=0x4052beb38db7869b15596d53c2d5c02c9307faffca9215e69b0f0d0e1812a6c2
+
+# On-Chain PCCS Configurations
+ENCLAVE_IDENTITY_HELPER=0xfd4a34b578B352FE1896CDafaEb0f45f993352Bf
+FMSPC_TCB_HELPER=0xC2A662e08A35513596E22D0aC236Ce72e59125EE
+X509_CRL_HELPER=0x12C1E13Aa2a238EAb15c2e2b6AC670266bc3C814
+X509_HELPER=0x5213c0e3Ab478dbc83E8afFF8909717332E4f8E1
+ENCLAVE_ID_DAO=0x413272890ab9F155a47A5F90a404Fb51aa259087
+FMSPC_TCB_DAO=0x7c04B466DebA13D48116b1339C62b35B9805E5A0
+PCK_DAO=0x6D4cA6AE5315EBBcb4331c82531db0ad8853Eb31
+PCS_DAO=0xD0335cbC73CA2f8EDd98a2BE3909f55642F414D7
+
+RISC0_VERIFIER=0x4967e2fB48E2037eC466a8b60722A94bBce48Eb7
+DCAP_ATTESTATION=0xefE368b17D137E86298eec8EbC5502fb56d27832
+
+PCCS_ROUTER=0xbFDeE7A1f1bFA2267cD0DA50BE76D8c4a3864543
+V3_VERIFIER=0x67042d171b8b7da1a4a98df787bdce79190dac3c

.github/workflows/contract-tests.yml

@@ -23,6 +23,14 @@ jobs:
         with:
           version: nightly
 
+      - name: Prepare Environment Variables
+        run: |
+          cp .env.sample.goerli .env
+          export $(grep -v '^#' .env | xargs) # Load variables
+          for var in $(grep -v '^#' .env | cut -d= -f1); do
+            echo "$var=${!var}" >> $GITHUB_ENV
+          done
+
       - name: Setup node/yarn
         uses: actions/setup-node@v3
         with:
@@ -34,7 +42,7 @@ jobs:
         run: yarn
 
       - name: Build
-        run: forge test
+        run: forge test --no-match-path test/foundry/ExpressLaneBalance.t.sol
   tests:
     if: false # broken
     name: Contract tests
@@ -53,6 +61,20 @@ jobs:
         with:
           version: nightly
 
+      - name: Prepare Environment Variables
+        run: |
+          cp .env.sample.goerli .env
+          export $(grep -v '^#' .env | xargs) # Load variables
+          for var in $(grep -v '^#' .env | cut -d= -f1); do
+            echo "$var=${!var}" >> $GITHUB_ENV
+          done
+
+      - name: Run unused Solidity errors checker
+        uses: OffchainLabs/actions/check-unused-errors@main
+        with:
+          directory: './src'
+          exceptions_file: './test/unused-errors/exceptions.txt'
+
       - name: Setup nodejs
         uses: actions/setup-node@v2
         with:
@@ -95,12 +117,6 @@ jobs:
       - name: Test function signatures
         run: yarn run test:signatures
 
-      - name: Run unused Solidity errors checker
-        uses: OffchainLabs/actions/check-unused-errors@main
-        with:
-          directory: './src'
-          exceptions_file: './test/unused-errors/exceptions.txt'
-
       - name: Run coverage
         run: yarn hardhat coverage --testfiles "test/contract/*.spec.ts"
 
@@ -128,7 +144,15 @@ jobs:
         with:
           version: nightly
 
-      - uses: OffchainLabs/actions/run-nitro-test-node@main
+      - name: Prepare Environment Variables
+        run: |
+          cp .env.sample.goerli .env
+          export $(grep -v '^#' .env | xargs) # Load variables
+          for var in $(grep -v '^#' .env | cut -d= -f1); do
+            echo "$var=${!var}" >> $GITHUB_ENV
+          done
+
+      - uses: OffchainLabs/actions/run-nitro-test-node@test-node-args
         with:
           args: --pos
           no-token-bridge: true
@@ -157,12 +181,20 @@ jobs:
         with:
           submodules: recursive
 
-      - uses: OffchainLabs/actions/run-nitro-test-node@main
+      - uses: EspressoSystems/offchainlabs-actions/run-nitro-test-node@specify-checkout-repo
         with:
           l3-node: true
+          args: --espresso --latest-espresso-image
           no-token-bridge: true
           no-l3-token-bridge: true
           nitro-contracts-branch: '${{ github.event.pull_request.head.sha || github.sha }}'
+          nitro-testnode-ref: celestia-integration
+          nitro-testnode-repo: EspressoSystems/nitro-testnode
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
 
       - name: Setup node/yarn
         uses: actions/setup-node@v3
@@ -171,6 +203,14 @@ jobs:
           cache: 'yarn'
           cache-dependency-path: '**/yarn.lock'
 
+      - name: Prepare Environment Variables
+        run: |
+          cp .env.sample.goerli .env
+          export $(grep -v '^#' .env | xargs) # Load variables
+          for var in $(grep -v '^#' .env | cut -d= -f1); do
+            echo "$var=${!var}" >> $GITHUB_ENV
+          done
+
       - name: Install packages
         run: yarn
 
@@ -188,13 +228,20 @@ jobs:
         with:
           submodules: recursive
 
-      - uses: OffchainLabs/actions/run-nitro-test-node@main
+      - uses: EspressoSystems/offchainlabs-actions/run-nitro-test-node@specify-checkout-repo
         with:
           l3-node: true
-          args: --l3-fee-token
+          args: --l3-fee-token --espresso --latest-espresso-image
           no-token-bridge: true
           no-l3-token-bridge: true
           nitro-contracts-branch: '${{ github.event.pull_request.head.sha || github.sha }}'
+          nitro-testnode-ref: celestia-integration
+          nitro-testnode-repo: EspressoSystems/nitro-testnode
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
 
       - name: Setup node/yarn
         uses: actions/setup-node@v3
@@ -203,6 +250,14 @@ jobs:
           cache: 'yarn'
           cache-dependency-path: '**/yarn.lock'
 
+      - name: Prepare Environment Variables
+        run: |
+          cp .env.sample.goerli .env
+          export $(grep -v '^#' .env | xargs) # Load variables
+          for var in $(grep -v '^#' .env | cut -d= -f1); do
+            echo "$var=${!var}" >> $GITHUB_ENV
+          done
+
       - name: Install packages
         run: yarn
 
@@ -220,13 +275,20 @@ jobs:
         with:
           submodules: recursive
 
-      - uses: OffchainLabs/actions/run-nitro-test-node@main
+      - uses: EspressoSystems/offchainlabs-actions/run-nitro-test-node@specify-checkout-repo
         with:
           l3-node: true
-          args: --l3-fee-token --l3-fee-token-decimals 6
+          args: --espresso --latest-espresso-image --l3-fee-token --l3-fee-token-decimals 6
           no-token-bridge: true
           no-l3-token-bridge: true
           nitro-contracts-branch: '${{ github.event.pull_request.head.sha || github.sha }}'
+          nitro-testnode-ref: 'celestia-integration'
+          nitro-testnode-repo: EspressoSystems/nitro-testnode
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
 
       - name: Setup node/yarn
         uses: actions/setup-node@v3
@@ -235,6 +297,14 @@ jobs:
           cache: 'yarn'
           cache-dependency-path: '**/yarn.lock'
 
+      - name: Prepare Environment Variables
+        run: |
+          cp .env.sample.goerli .env
+          export $(grep -v '^#' .env | xargs) # Load variables
+          for var in $(grep -v '^#' .env | cut -d= -f1); do
+            echo "$var=${!var}" >> $GITHUB_ENV
+          done
+
       - name: Install packages
         run: yarn
 

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "lib/automata-dcap-attestation"]
+	path = lib/automata-dcap-attestation
+	url = https://github.com/EspressoSystems/automata-dcap-attestation

deploy/SequencerInboxStubCreator.js

@@ -6,6 +6,13 @@ module.exports = async hre => {
   const { deployer } = await getNamedAccounts()
 
   const bridge = await ethers.getContract('BridgeStub')
+
+  const espressoTEEVerifierInboxFac = await ethers.getContractFactory(
+    'EspressoTEEVerifierMock'
+  )
+  const espressoTEEVerifier = await espressoTEEVerifierInboxFac.deploy()
+  await espressoTEEVerifier.deployed()
+
   const reader4844 = await Toolkit4844.deployReader4844(
     await ethers.getSigner(deployer)
   )
@@ -24,6 +31,7 @@ module.exports = async hre => {
       117964,
       reader4844.address,
       false,
+      espressoTEEVerifier.address,
     ],
   })
 }

foundry.toml

@@ -5,9 +5,11 @@ libs = ['node_modules', 'lib']
 test = 'test/foundry'
 cache_path  = 'forge-cache/sol'
 optimizer = true
-optimizer_runs = 100
-via_ir = false
+optimizer_runs = 1
+via_ir = true
+solc_version = '0.8.25'
 evm_version = 'cancun'
+fs_permissions = [{ access = "read", path = "./"}]
 remappings = ['ds-test/=lib/forge-std/lib/ds-test/src/',
               'forge-std/=lib/forge-std/src/',
               '@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/',
@@ -24,4 +26,4 @@ auto_detect_remappings = false
 [fmt]
 number_underscore = 'thousands'
 line_length = 100
-# See more config options https://github.com/foundry-rs/foundry/tree/master/config
+# See more config options https://github.com/foundry-rs/foundry/tree/master/config

hardhat.config.ts

@@ -7,6 +7,7 @@ import 'solidity-coverage'
 import 'hardhat-gas-reporter'
 import 'hardhat-contract-sizer'
 import 'hardhat-ignore-warnings'
+import '@nomicfoundation/hardhat-foundry'
 // import '@tovarishfin/hardhat-yul';
 import dotenv from 'dotenv'
 
@@ -15,18 +16,19 @@ dotenv.config()
 const solidity = {
   compilers: [
     {
-      version: '0.8.9',
+      version: '0.8.25',
       settings: {
         optimizer: {
           enabled: true,
           runs: 100,
         },
+        viaIR: true,
       },
     },
   ],
   overrides: {
     'src/rollup/RollupUserLogic.sol': {
-      version: '0.8.26',
+      version: '0.8.20',
       settings: {
         optimizer: {
           enabled: true,
@@ -221,6 +223,14 @@ module.exports = {
           browserURL: 'https://sepolia.arbiscan.io/',
         },
       },
+      {
+        network: 'baseSepolia',
+        chainId: 84532,
+        urls: {
+          apiURL: 'https://api-sepolia.basescan.org/api',
+          browserURL: 'https://sepolia.basescan.org/',
+        },
+      },
     ],
   },
   mocha: {

package.json

@@ -23,7 +23,7 @@
     "prepublishOnly": "hardhat clean && forge clean && hardhat compile && yarn build:forge:yul",
     "build:all": "yarn build && yarn build:forge",
     "build": "hardhat compile",
-    "build:forge:sol": "forge build --skip *.yul",
+    "build:forge:sol": "forge build --skip *.yul test/foundry/ExpressLaneBalance.t.sol",
     "build:forge:yul": "FOUNDRY_PROFILE=yul forge build --skip *.sol",
     "build:forge": "yarn build:forge:sol && yarn build:forge:yul",
     "contract:size": "hardhat size-contracts",
@@ -50,17 +50,18 @@
     "deploy-cachemanager-testnode": "hardhat run scripts/local-deployment/deployCacheManager.ts"
   },
   "dependencies": {
+    "@nomicfoundation/hardhat-verify": "^2.0.12",
     "@offchainlabs/upgrade-executor": "1.1.0-beta.0",
-    "@openzeppelin/contracts": "4.5.0",
-    "@openzeppelin/contracts-upgradeable": "4.5.2",
+    "@openzeppelin/contracts": "4.8.0",
+    "@openzeppelin/contracts-upgradeable": "4.8.0",
     "patch-package": "^6.4.7",
     "solady": "0.0.182"
   },
   "private": false,
   "devDependencies": {
     "@arbitrum/sdk": "^3.4.1",
     "@ethersproject/providers": "^5.7.2",
-    "@nomicfoundation/hardhat-verify": "^2.0.9",
+    "@nomicfoundation/hardhat-foundry": "^1.1.2",
     "@nomiclabs/hardhat-ethers": "npm:hardhat-deploy-ethers@^0.3.0-beta.13",
     "@nomiclabs/hardhat-waffle": "^2.0.1",
     "@tovarishfin/hardhat-yul": "^3.0.5",

remappings.txt

@@ -0,0 +1,8 @@
+ds-test/=lib/forge-std/lib/ds-test/src/
+forge-std/=lib/forge-std/src/
+openzeppelin-contracts/=node_modules/@openzeppelin/contracts/
+@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
+@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/
+@automata-network/dcap-attestation/contracts=lib/automata-dcap-attestation/contracts/
+@automata-network/dcap-attestation/test=lib/automata-dcap-attestation/forge-test/
+solady/=node_modules/solady/src/

scripts/config.ts.example

@@ -24,6 +24,7 @@ export const config = {
       delaySeconds: ethers.BigNumber.from('86400'),
       futureSeconds: ethers.BigNumber.from('3600'),
     },
+    espressoTEEVerifier: '0xb562622f2D76F355D673560CB88c1dF6088702f1',
   },
   validators: [
     '0x1234123412341234123412341234123412341234',

scripts/createERC20Rollup.ts

@@ -34,11 +34,17 @@ async function main() {
     throw new Error('ROLLUP_CREATOR_ADDRESS not set')
   }
 
+  const espressoTEEVerifierAddress = process.env.ESPRESSO_TEE_VERIFIER_ADDRESS
+  if (!espressoTEEVerifierAddress) {
+    throw new Error('ESPRESSO_TEE_VERIFIER_ADDRESS not set')
+  }
+
   console.log('Creating new rollup with', customFeeTokenAddress, 'as fee token')
   await createRollup(
     deployer,
     false,
     rollupCreatorAddress,
+    espressoTEEVerifierAddress,
     customFeeTokenAddress
   )
 }