From 279fdf6a5ff9bda81bfb2e9429b5f71ead7963d0 Mon Sep 17 00:00:00 2001 From: zero Date: Fri, 19 Jan 2024 09:29:42 +0100 Subject: [PATCH] spec: rename coin params to coin attrs --- doc/src/spec/contract/dao/scheme.md | 6 +++--- doc/src/spec/contract/money/model.md | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/src/spec/contract/dao/scheme.md b/doc/src/spec/contract/dao/scheme.md index fb9fe4c62..fdf1e8b62 100644 --- a/doc/src/spec/contract/dao/scheme.md +++ b/doc/src/spec/contract/dao/scheme.md @@ -85,7 +85,7 @@ $$ \begin{aligned} Let $tβ‚€ = \t{CurrentDay} ∈ π”½β‚š$ be the current day as defined in [Current Day](model.md#current-day). -Let $\t{Params}_\t{Coin}$ be defined as in [Coin](../money/model.md#coin). +Let $\t{Attrs}_\t{Coin}$ be defined as in [Coin](../money/model.md#coin). **Valid DAO bulla merkle root**   check that $R_\t{DAO}$ is a previously seen merkle root in the DAO contract merkle roots DB. @@ -134,7 +134,7 @@ previously seen merkle root in the money contract merkle roots DB.   Let there be a prover auxiliary witness inputs: $$ \begin{aligned} x_c &∈ π”½β‚š \\ - c &∈ \t{Params}_\t{Coin} \\ + c &∈ \t{Attrs}_\t{Coin} \\ bα΅₯ &∈ 𝔽α΅₯ \\ b_Ο„ &∈ π”½β‚š \\ (ψᡒ, Ξ α΅’) &∈ \t{MerklePos} Γ— \t{MerklePath} \\ @@ -232,7 +232,7 @@ DAO contract nullifiers DB for this specific proposal. Let there be prover auxiliary witness inputs: $$ \begin{aligned} x_c &∈ π”½β‚š \\ - c &∈ \t{Params}_\t{Coin} \\ + c &∈ \t{Attrs}_\t{Coin} \\ bα΅₯ &∈ 𝔽α΅₯ \\ b_Ο„ &∈ π”½β‚š \\ (ψᡒ, Ξ α΅’) &∈ \t{MerklePos} Γ— \t{MerklePath} \\ diff --git a/doc/src/spec/contract/money/model.md b/doc/src/spec/contract/money/model.md index 36eae5a71..5cfb5a7cb 100644 --- a/doc/src/spec/contract/money/model.md +++ b/doc/src/spec/contract/money/model.md @@ -22,20 +22,20 @@ The coin contains the main parameters that define the `Money::transfer()` operat contract to store additional parameters in the coin. If the parameter length exceeds the size of $π”½β‚š$ then a commit can be used here instead. -Define the coin params +Define the coin attributes $$ \begin{aligned} - \t{Params}_\t{Coin}.\t{PK} &∈ β„™β‚š \\ - \t{Params}_\t{Coin}.v &∈ ℕ₆₄ \\ - \t{Params}_\t{Coin}.Ο„ &∈ π”½β‚š \\ - \t{Params}_\t{Coin}.ΞΆ &∈ π”½β‚š \\ - \t{Params}_\t{Coin}.\t{SH} &∈ π”½β‚š \\ - \t{Params}_\t{Coin}.\t{UD} &∈ π”½β‚š \\ + \t{Attrs}_\t{Coin}.\t{PK} &∈ β„™β‚š \\ + \t{Attrs}_\t{Coin}.v &∈ ℕ₆₄ \\ + \t{Attrs}_\t{Coin}.Ο„ &∈ π”½β‚š \\ + \t{Attrs}_\t{Coin}.ΞΆ &∈ π”½β‚š \\ + \t{Attrs}_\t{Coin}.\t{SH} &∈ π”½β‚š \\ + \t{Attrs}_\t{Coin}.\t{UD} &∈ π”½β‚š \\ \end{aligned} $$ ```rust {{#include ../../../../../src/contract/money/src/model.rs:coin-attributes}} ``` -$$ \t{Coin} : \t{Params}_\t{Coin} β†’ π”½β‚š $$ +$$ \t{Coin} : \t{Attrs}_\t{Coin} β†’ π”½β‚š $$ $$ \t{Coin}(p) = \t{Bulla}(\mathcal{X}(p.\t{PK}), \mathcal{Y}(p.\t{PK}), ℕ₆₄2π”½β‚š(p.v), p.Ο„, p.ΞΆ, p.\t{SH}, p.\t{UD}) $$