Skip to content

Commit 582bf5f

Browse files
authored
Hub consistency arguments clean up (#49)
1 parent 203b373 commit 582bf5f

10 files changed

+63
-283
lines changed

hub/consistencies/account/_inputs.tex

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
\subsubsection{Properties of the permutation} \label{hub: consistencies: account: permutation} \input{consistencies/account/permutation}
22
\subsubsection{Permuted columns \lispDone{}} \label{hub: consistencies: account: columns} \input{consistencies/account/columns}
3-
\subsubsection{Constraints for ``\col{FIRST}'', ``\col{AGAIN}'' and ``\col{FINAL}'' columns \lispDone{}} \label{hub: consistencies: account: permutation} \input{consistencies/account/first_again_final}
3+
\subsubsection{Constraints for ``\col{FIRST}'', ``\col{AGAIN}'' and ``\col{FINAL}'' columns \lispDone{}} \label{hub: consistencies: account: first again final} \input{consistencies/account/first_again_final}
44
\subsubsection{Initialization constraints \lispDone{}} \label{hub: consistencies: account: init constraints} \input{consistencies/account/init}
55
\subsubsection{Linking constraints \lispDone{}} \label{hub: consistencies: account: link constraints} \input{consistencies/account/link}
66
\subsubsection{Finalization constraints \lispDone{}} \label{hub: consistencies: account: finl constraints} \input{consistencies/account/finl}

hub/consistencies/account/columns.tex

+19-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,25 @@
4343
\define
4444
256^\llarge \cdot \order{\accAddress\high}_{i} + \order{\accAddress\low}_{i}
4545
\]
46-
We also introduce the following columns, which, \emph{despite notations}, don't have corresponding ``temporal'' columns
46+
We also \emph{introduce}, for convenience, the following columns.
47+
Despite what their names and notations suggest they don't correspond to the permutations of other columns,
48+
i.e. they aren't derived by permuting ``temporal'' columns according to the previous row permutation.
49+
These columns exist purely ``in the permuted domain.''
50+
\begin{multicols}{3}
51+
\begin{enumerate}
52+
\item $\accFirstInConflation$
53+
\item $\accAgainInConflation$
54+
\item $\accFinalInConflation$
55+
\item $\accFirstInBlock$
56+
\item $\accAgainInBlock$
57+
\item $\accFinalInBlock$
58+
\item $\accFirstInTransaction$
59+
\item $\accAgainInTransaction$
60+
\item $\accFinalInTransaction$
61+
\end{enumerate}
62+
\end{multicols}
63+
\noindent These columns follow the specification laid out in section~(\ref{hub: consistencies: account: first again final}).
64+
We also \emph{introduce} the following columns, which, again, and despite notations, don't have corresponding ``temporal'' columns
4765
\label{hub: consistencies: account: permuted columns without temporal counterparts}
4866
\begin{multicols}{2}
4967
\begin{enumerate}

hub/consistencies/account/first_again_final.tex

-16
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
The present section specifies the behaviour of the following columns:
2-
\begin{multicols}{3}
3-
\begin{enumerate}
4-
\item $\accFirstInConflation$
5-
\item $\accAgainInConflation$
6-
\item $\accFinalInConflation$
7-
\item $\accFirstInBlock$
8-
\item $\accAgainInBlock$
9-
\item $\accFinalInBlock$
10-
\item $\accFirstInTransaction$
11-
\item $\accAgainInTransaction$
12-
\item $\accFinalInTransaction$
13-
\end{enumerate}
14-
\end{multicols}
15-
\noindent Contrary to what their name suggests these columns aren't a permutation of existing columns.
16-
These columns existe purely ``in the permuted domain.''
171
We provide a full specification of these columns here.
182
\begin{description}
193
\item[\underline{\underline{Generalities:}}]

hub/consistencies/account/zzz_constraints_(old).tex

-130
This file was deleted.

hub/consistencies/account/zzz_opt.tex

-117
This file was deleted.

hub/consistencies/context/columns.tex

+8
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,11 @@
3030
\item[\vspace{\fill}]
3131
\end{enumerate}
3232
\end{multicols}
33+
\noindent We further introduce the following columns
34+
\begin{multicols}{2}
35+
\begin{enumerate}
36+
\item $\conContextFirst$
37+
\item $\conContextAgain$
38+
\end{enumerate}
39+
\end{multicols}
40+
\noindent Their introduction simplifies the upcoming constraints.

hub/consistencies/stack/columns.tex

+10
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,13 @@
1212
\item[\vspace{\fill}]
1313
\end{enumerate}
1414
\end{multicols}
15+
\noindent We further introduce the following columns
16+
\begin{multicols}{2}
17+
\begin{enumerate}
18+
\item $\stackContextFirst$
19+
\item $\stackContextAgain$
20+
\item $\stackSpotFirst$
21+
\item $\stackSpotAgain$
22+
\end{enumerate}
23+
\end{multicols}
24+
\noindent Their introduction simplifies the upcoming constraints.

hub/consistencies/storage/_inputs.tex

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
\subsubsection{Properties of the permutation} \label{hub: consistencies: storage: permutation} \input{consistencies/storage/permutation}
22
\subsubsection{Permuted columns \lispDone{}} \label{hub: consistencies: storage: columns} \input{consistencies/storage/columns}
3-
\subsubsection{Constraints for ``\col{FIRST}'', ``\col{AGAIN}'' and ``\col{FINAL}'' columns \lispDone{}} \label{hub: consistencies: storage: permutation} \input{consistencies/storage/first_again_final}
3+
\subsubsection{Constraints for ``\col{FIRST}'', ``\col{AGAIN}'' and ``\col{FINAL}'' columns \lispDone{}} \label{hub: consistencies: storage: first again final} \input{consistencies/storage/first_again_final}
44
\subsubsection{Constraints \lispDone{}} \label{hub: consistencies: storage: constraints} \input{consistencies/storage/constraints}

hub/consistencies/storage/columns.tex

+24
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,27 @@
4343
\define
4444
256^\llarge \cdot \order{\stoAddressHi}_{i} + \order{\stoAddressLo}_{i}
4545
\]
46+
\noindent We introduce some more columns.
47+
Similar remarks to those of section~(\ref{hub: consistencies: account: first again final}) apply to these following columns.
48+
\begin{multicols}{3}
49+
\begin{enumerate}
50+
\item $\stoFirstInConflation$
51+
\item $\stoAgainInConflation$
52+
\item $\stoFinalInConflation$
53+
\item $\stoFirstInBlock$
54+
\item $\stoAgainInBlock$
55+
\item $\stoFinalInBlock$
56+
\item $\stoFirstInTransaction$
57+
\item $\stoAgainInTransaction$
58+
\item $\stoFinalInTransaction$
59+
\end{enumerate}
60+
\end{multicols}
61+
We also \emph{introduce} the following columns:
62+
\begin{multicols}{2}
63+
\begin{enumerate}
64+
\item $\order{\stoDeploymentNumberFirstInBlock}$
65+
\item $\order{\stoDeploymentNumberFinalInBlock}$
66+
\end{enumerate}
67+
\end{multicols}
68+
\noindent \textbf{Storage-rows} may not conain sufficient information to set either of these columns.
69+
They will be set implicitly by the lookup from section~(\ref{hub: lookups: hub into hub}).

hub/consistencies/storage/first_again_final.tex

-17
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
1-
The present section specifies the behaviour of the following columns:
2-
\begin{multicols}{3}
3-
\begin{enumerate}
4-
\item $\stoFirstInConflation$
5-
\item $\stoAgainInConflation$
6-
\item $\stoFinalInConflation$
7-
\item $\stoFirstInBlock$
8-
\item $\stoAgainInBlock$
9-
\item $\stoFinalInBlock$
10-
\item $\stoFirstInTransaction$
11-
\item $\stoAgainInTransaction$
12-
\item $\stoFinalInTransaction$
13-
\end{enumerate}
14-
\end{multicols}
15-
\noindent Contrary to what their name suggests, and in the spirit of section~(\ref{hub: consistencies: account: permutation}), these columns aren't a permutation of existing columns.
16-
These columns existe purely ``in the permuted domain.''
17-
We provide a full specification of these columns here.
181
\begin{description}
192
\item[\underline{\underline{Generalities:}}]
203
we impose the following

0 commit comments

Comments
 (0)