Update private fee switch

ProvableHQ · Oct 3, 2023 · 1207a12 · 1207a12
1 parent 6053edb
commit 1207a12
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 10 deletions.
diff --git a/sdk/package-lock.json b/sdk/package-lock.json
diff --git a/wasm/src/programs/manager/join.rs b/wasm/src/programs/manager/join.rs
@@ -84,7 +84,11 @@ impl ProgramManager {
         let mut new_process;
         let process = get_process!(self, cache, new_process);
         let stack = process.get_stack("credits.aleo").map_err(|e| e.to_string())?;
-        let fee_identifier = IdentifierNative::from_str("fee").map_err(|e| e.to_string())?;
+        let fee_identifier = if fee_record.is_some() {
+            IdentifierNative::from_str("fee_private").map_err(|e| e.to_string())?
+        } else {
+            IdentifierNative::from_str("fee_public").map_err(|e| e.to_string())?
+        };
         if !stack.contains_proving_key(&fee_identifier) && fee_proving_key.is_some() && fee_verifying_key.is_some() {
             let fee_proving_key = fee_proving_key.clone().unwrap();
             let fee_verifying_key = fee_verifying_key.clone().unwrap();

diff --git a/wasm/src/programs/manager/transfer.rs b/wasm/src/programs/manager/transfer.rs
@@ -129,7 +129,11 @@ impl ProgramManager {
 
         let mut new_process;
         let process = get_process!(self, cache, new_process);
-        let fee_identifier = IdentifierNative::from_str("fee").map_err(|e| e.to_string())?;
+        let fee_identifier = if fee_record.is_some() {
+            IdentifierNative::from_str("fee_private").map_err(|e| e.to_string())?
+        } else {
+            IdentifierNative::from_str("fee_public").map_err(|e| e.to_string())?
+        };
         let stack = process.get_stack("credits.aleo").map_err(|e| e.to_string())?;
         if !stack.contains_proving_key(&fee_identifier) && fee_proving_key.is_some() && fee_verifying_key.is_some() {
             let fee_proving_key = fee_proving_key.clone().unwrap();

diff --git a/website/src/tabs/develop/Deploy.jsx b/website/src/tabs/develop/Deploy.jsx
@@ -283,7 +283,7 @@ export const Deploy = () => {
                     />
                 </Form.Item>
                 <Form.Item
-                    label="Private Fee?"
+                    label="Private Fee"
                     name="private_fee"
                     valuePropName="checked"
                     initialValue={true}

diff --git a/website/src/tabs/develop/ExecuteLegacy.jsx b/website/src/tabs/develop/ExecuteLegacy.jsx
@@ -526,7 +526,7 @@ export const ExecuteLegacy = () => {
                 )}
                 {executeOnline === true && (
                     <Form.Item
-                        label="Private Fee?"
+                        label="Private Fee"
                         name="private_fee"
                         valuePropName="checked"
                         initialValue={true}

diff --git a/website/src/tabs/develop/Join.jsx b/website/src/tabs/develop/Join.jsx
@@ -197,7 +197,7 @@ export const Join = () => {
                     />
                 </Form.Item>
                 <Form.Item
-                    label="Private Fee?"
+                    label="Private Fee"
                     name="private_fee"
                     valuePropName="checked"
                     initialValue={true}

diff --git a/website/src/tabs/develop/Transfer.jsx b/website/src/tabs/develop/Transfer.jsx
@@ -280,7 +280,7 @@ export const Transfer = () => {
                     />
                 </Form.Item>
                 <Form.Item
-                    label="Private Fee?"
+                    label="Private Fee"
                     name="private_fee"
                     valuePropName="checked"
                     initialValue={true}

diff --git a/website/src/tabs/develop/execute/index.jsx b/website/src/tabs/develop/execute/index.jsx
@@ -363,13 +363,13 @@ export const Execute = () => {
                                     />
                                 </Form.Item>
                                 <Form.Item
-                                    label="Private Fee?"
+                                    label="Private Fee"
                                     name="private_fee"
                                     valuePropName="checked"
-                                    initialValue={false}
+                                    initialValue={true}
                                     hidden={!getFieldValue("execute_onchain")}
                                 >
-                                    <Switch />
+                                    <Switch defaultChecked />
                                 </Form.Item>
                                 <Form.Item
                                     noStyle