updated yellow paper

AztecProtocol · Feb 6, 2024 · 1dd3ec5 · 1dd3ec5
1 parent 7677118
commit 1dd3ec5
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 10 deletions.
diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.ts
@@ -31,7 +31,7 @@ export class Sequencer {
   private pollingIntervalMs: number = 1000;
   private maxTxsPerBlock = 32;
   private minTxsPerBLock = 1;
-  // TODO(benesjan): The following values should not default to zero.
+  // TODO: zero values should not be allowed for the following 2 values in PROD
   private coinbase = EthAddress.ZERO;
   private feeRecipient = AztecAddress.ZERO;
   private lastPublishedBlock = 0;

diff --git a/yellow-paper/docs/rollup-circuits/base-rollup.md b/yellow-paper/docs/rollup-circuits/base-rollup.md
@@ -38,7 +38,8 @@ class GlobalVariables {
     timestamp: Fr
     version: Fr
     chain_id: Fr
-    coinbase: Address
+    coinbase: EthAddress
+    fee_recipient: Address
 }
 
 class Header {
@@ -311,8 +312,8 @@ def kernel_checks(
   assert kernel.proof.verify(kernel.public_inputs)
 
   tx_context = kernel.public_inputs.constants.tx_context
-  assert tx_context.chainid == constants.globalVariables.chainid
-  assert tx_context.version == constants.globalVariables.version
+  assert tx_context.chain_id == constants.global_variables.chain_id
+  assert tx_context.version == constants.global_variables.version
 
   assert len(kernel.public_inputs.end.private_call_stack) == 0
   assert len(kernel.public_inputs.end.public_call_stack) == 0

diff --git a/yellow-paper/docs/rollup-circuits/index.md b/yellow-paper/docs/rollup-circuits/index.md
@@ -115,7 +115,8 @@ class GlobalVariables {
     timestamp: Fr
     version: Fr
     chain_id: Fr
-    coinbase: Address
+    coinbase: EthAddress
+    fee_recipient: Address
 }
 
 class Header {

diff --git a/yellow-paper/docs/rollup-circuits/merge-rollup.md b/yellow-paper/docs/rollup-circuits/merge-rollup.md
@@ -29,7 +29,8 @@ class GlobalVariables {
     timestamp: Fr
     version: Fr
     chain_id: Fr
-    coinbase: Address
+    coinbase: EthAddress
+    fee_recipient: Address
 }
 
 class ConstantRollupData {

diff --git a/yellow-paper/docs/rollup-circuits/root-rollup.md b/yellow-paper/docs/rollup-circuits/root-rollup.md
@@ -39,8 +39,8 @@ class GlobalVariables {
     timestamp: Fr
     version: Fr
     chain_id: Fr
-    coinbase: Address
-}
+    coinbase: EthAddress
+    fee_recipient: Address}
 
 class Header {
     last_archive: Snapshot

diff --git a/yellow-paper/docs/state/archive.md b/yellow-paper/docs/state/archive.md
@@ -33,7 +33,8 @@ class GlobalVariables {
     timestamp: Fr
     version: Fr
     chain_id: Fr
-    coinbase: Address
+    coinbase: EthAddress
+    fee_recipient: Address
 }
 
 class Header {

diff --git a/yellow-paper/docs/state/index.md b/yellow-paper/docs/state/index.md
@@ -77,7 +77,8 @@ class GlobalVariables {
     timestamp: Fr
     version: Fr
     chain_id: Fr
-    coinbase: Address
+    coinbase: EthAddress
+    fee_recipient: Address
 }
 
 class Header {