Start fixing some tests for rc5

casper-ecosystem · Dec 16, 2024 · 62e65a9 · 62e65a9
1 parent 02c72dc
commit 62e65a9
Show file tree

Hide file tree

Showing 30 changed files with 2,788 additions and 2,677 deletions.
diff --git a/examples/desktop/electron/release/Casper Webclient 2.0.0.exe b/examples/desktop/electron/release/Casper Webclient 2.0.0.exe
diff --git a/examples/desktop/electron/release/Casper Webclient-2.0.0.AppImage b/examples/desktop/electron/release/Casper Webclient-2.0.0.AppImage
diff --git a/examples/desktop/electron/release/builder-debug.yml b/examples/desktop/electron/release/builder-debug.yml
@@ -34,4 +34,4 @@ x64:
       - index.js
       - favicon.png
 nsis:
-  script: "!include \"/opt2/casper/rustSDK/examples/desktop/electron/node_modules/app-builder-lib/templates/nsis/include/StdUtils.nsh\"\n!addincludedir \"/opt2/casper/rustSDK/examples/desktop/electron/node_modules/app-builder-lib/templates/nsis/include\"\n!macro _isUpdated _a _b _t _f\n  ${StdUtils.TestParameter} $R9 \"updated\"\n  StrCmp \"$R9\" \"true\" `${_t}` `${_f}`\n!macroend\n!define isUpdated `\"\" isUpdated \"\"`\n\n!macro _isForceRun _a _b _t _f\n  ${StdUtils.TestParameter} $R9 \"force-run\"\n  StrCmp \"$R9\" \"true\" `${_t}` `${_f}`\n!macroend\n!define isForceRun `\"\" isForceRun \"\"`\n\n!macro _isKeepShortcuts _a _b _t _f\n  ${StdUtils.TestParameter} $R9 \"keep-shortcuts\"\n  StrCmp \"$R9\" \"true\" `${_t}` `${_f}`\n!macroend\n!define isKeepShortcuts `\"\" isKeepShortcuts \"\"`\n\n!macro _isNoDesktopShortcut _a _b _t _f\n  ${StdUtils.TestParameter} $R9 \"no-desktop-shortcut\"\n  StrCmp \"$R9\" \"true\" `${_t}` `${_f}`\n!macroend\n!define isNoDesktopShortcut `\"\" isNoDesktopShortcut \"\"`\n\n!macro _isDeleteAppData _a _b _t _f\n  ${StdUtils.TestParameter} $R9 \"delete-app-data\"\n  StrCmp \"$R9\" \"true\" `${_t}` `${_f}`\n!macroend\n!define isDeleteAppData `\"\" isDeleteAppData \"\"`\n\n!macro _isForAllUsers _a _b _t _f\n  ${StdUtils.TestParameter} $R9 \"allusers\"\n  StrCmp \"$R9\" \"true\" `${_t}` `${_f}`\n!macroend\n!define isForAllUsers `\"\" isForAllUsers \"\"`\n\n!macro _isForCurrentUser _a _b _t _f\n  ${StdUtils.TestParameter} $R9 \"currentuser\"\n  StrCmp \"$R9\" \"true\" `${_t}` `${_f}`\n!macroend\n!define isForCurrentUser `\"\" isForCurrentUser \"\"`\n\n!macro addLangs\n  !insertmacro MUI_LANGUAGE \"English\"\n  !insertmacro MUI_LANGUAGE \"German\"\n  !insertmacro MUI_LANGUAGE \"French\"\n  !insertmacro MUI_LANGUAGE \"SpanishInternational\"\n  !insertmacro MUI_LANGUAGE \"SimpChinese\"\n  !insertmacro MUI_LANGUAGE \"TradChinese\"\n  !insertmacro MUI_LANGUAGE \"Japanese\"\n  !insertmacro MUI_LANGUAGE \"Korean\"\n  !insertmacro MUI_LANGUAGE \"Italian\"\n  !insertmacro MUI_LANGUAGE \"Dutch\"\n  !insertmacro MUI_LANGUAGE \"Danish\"\n  !insertmacro MUI_LANGUAGE \"Swedish\"\n  !insertmacro MUI_LANGUAGE \"Norwegian\"\n  !insertmacro MUI_LANGUAGE \"Finnish\"\n  !insertmacro MUI_LANGUAGE \"Russian\"\n  !insertmacro MUI_LANGUAGE \"Portuguese\"\n  !insertmacro MUI_LANGUAGE \"PortugueseBR\"\n  !insertmacro MUI_LANGUAGE \"Polish\"\n  !insertmacro MUI_LANGUAGE \"Ukrainian\"\n  !insertmacro MUI_LANGUAGE \"Czech\"\n  !insertmacro MUI_LANGUAGE \"Slovak\"\n  !insertmacro MUI_LANGUAGE \"Hungarian\"\n  !insertmacro MUI_LANGUAGE \"Arabic\"\n  !insertmacro MUI_LANGUAGE \"Turkish\"\n  !insertmacro MUI_LANGUAGE \"Thai\"\n  !insertmacro MUI_LANGUAGE \"Vietnamese\"\n!macroend\n\n!addplugindir /x86-unicode \"/home/greg/.cache/electron-builder/nsis/nsis-resources-3.4.1/plugins/x86-unicode\"\n!include \"/tmp/t-0HUqAo/0-messages.nsh\"\n\n!include \"common.nsh\"\n!include \"extractAppPackage.nsh\"\n\n# https://github.com/electron-userland/electron-builder/issues/3972#issuecomment-505171582\nCRCCheck off\nWindowIcon Off\nAutoCloseWindow True\nRequestExecutionLevel ${REQUEST_EXECUTION_LEVEL}\n\nFunction .onInit\n  !ifndef SPLASH_IMAGE\n    SetSilent silent\n  !endif\n\n  !insertmacro check64BitAndSetRegView\nFunctionEnd\n\nFunction .onGUIInit\n  InitPluginsDir\n\n  !ifdef SPLASH_IMAGE\n    File /oname=$PLUGINSDIR\\splash.bmp \"${SPLASH_IMAGE}\"\n    BgImage::SetBg $PLUGINSDIR\\splash.bmp\n    BgImage::Redraw\n  !endif\nFunctionEnd\n\nSection\n  !ifdef SPLASH_IMAGE\n    HideWindow\n  !endif\n\n  StrCpy $INSTDIR \"$PLUGINSDIR\\app\"\n  !ifdef UNPACK_DIR_NAME\n    StrCpy $INSTDIR \"$TEMP\\${UNPACK_DIR_NAME}\"\n  !endif\n\n  RMDir /r $INSTDIR\n  SetOutPath $INSTDIR\n\n  !ifdef APP_DIR_64\n    !ifdef APP_DIR_ARM64\n      !ifdef APP_DIR_32\n        ${if} ${IsNativeARM64}\n          File /r \"${APP_DIR_ARM64}\\*.*\"\n        ${elseif} ${RunningX64}\n          File /r \"${APP_DIR_64}\\*.*\"\n        ${else}\n          File /r \"${APP_DIR_32}\\*.*\"\n        ${endIf}\n      !else\n        ${if} ${IsNativeARM64}\n          File /r \"${APP_DIR_ARM64}\\*.*\"\n        ${else}\n          File /r \"${APP_DIR_64}\\*.*\"\n        {endIf}\n      !endif\n    !else\n      !ifdef APP_DIR_32\n        ${if} ${RunningX64}\n          File /r \"${APP_DIR_64}\\*.*\"\n        ${else}\n          File /r \"${APP_DIR_32}\\*.*\"\n        ${endIf}\n      !else\n        File /r \"${APP_DIR_64}\\*.*\"\n      !endif\n    !endif\n  !else\n    !ifdef APP_DIR_32\n      File /r \"${APP_DIR_32}\\*.*\"\n    !else\n      !insertmacro extractEmbeddedAppPackage\n    !endif\n  !endif\n\n  System::Call 'Kernel32::SetEnvironmentVariable(t, t)i (\"PORTABLE_EXECUTABLE_DIR\", \"$EXEDIR\").r0'\n  System::Call 'Kernel32::SetEnvironmentVariable(t, t)i (\"PORTABLE_EXECUTABLE_FILE\", \"$EXEPATH\").r0'\n  System::Call 'Kernel32::SetEnvironmentVariable(t, t)i (\"PORTABLE_EXECUTABLE_APP_FILENAME\", \"${APP_FILENAME}\").r0'\n  ${StdUtils.GetAllParameters} $R0 0\n\n  !ifdef SPLASH_IMAGE\n    BgImage::Destroy\n  !endif\n\n\tExecWait \"$INSTDIR\\${APP_EXECUTABLE_FILENAME} $R0\" $0\n  SetErrorLevel $0\n\n  SetOutPath $EXEDIR\n\tRMDir /r $INSTDIR\nSectionEnd\n"
+  script: "!include \"/opt2/casper/rustSDK/examples/desktop/electron/node_modules/app-builder-lib/templates/nsis/include/StdUtils.nsh\"\n!addincludedir \"/opt2/casper/rustSDK/examples/desktop/electron/node_modules/app-builder-lib/templates/nsis/include\"\n!macro _isUpdated _a _b _t _f\n  ${StdUtils.TestParameter} $R9 \"updated\"\n  StrCmp \"$R9\" \"true\" `${_t}` `${_f}`\n!macroend\n!define isUpdated `\"\" isUpdated \"\"`\n\n!macro _isForceRun _a _b _t _f\n  ${StdUtils.TestParameter} $R9 \"force-run\"\n  StrCmp \"$R9\" \"true\" `${_t}` `${_f}`\n!macroend\n!define isForceRun `\"\" isForceRun \"\"`\n\n!macro _isKeepShortcuts _a _b _t _f\n  ${StdUtils.TestParameter} $R9 \"keep-shortcuts\"\n  StrCmp \"$R9\" \"true\" `${_t}` `${_f}`\n!macroend\n!define isKeepShortcuts `\"\" isKeepShortcuts \"\"`\n\n!macro _isNoDesktopShortcut _a _b _t _f\n  ${StdUtils.TestParameter} $R9 \"no-desktop-shortcut\"\n  StrCmp \"$R9\" \"true\" `${_t}` `${_f}`\n!macroend\n!define isNoDesktopShortcut `\"\" isNoDesktopShortcut \"\"`\n\n!macro _isDeleteAppData _a _b _t _f\n  ${StdUtils.TestParameter} $R9 \"delete-app-data\"\n  StrCmp \"$R9\" \"true\" `${_t}` `${_f}`\n!macroend\n!define isDeleteAppData `\"\" isDeleteAppData \"\"`\n\n!macro _isForAllUsers _a _b _t _f\n  ${StdUtils.TestParameter} $R9 \"allusers\"\n  StrCmp \"$R9\" \"true\" `${_t}` `${_f}`\n!macroend\n!define isForAllUsers `\"\" isForAllUsers \"\"`\n\n!macro _isForCurrentUser _a _b _t _f\n  ${StdUtils.TestParameter} $R9 \"currentuser\"\n  StrCmp \"$R9\" \"true\" `${_t}` `${_f}`\n!macroend\n!define isForCurrentUser `\"\" isForCurrentUser \"\"`\n\n!macro addLangs\n  !insertmacro MUI_LANGUAGE \"English\"\n  !insertmacro MUI_LANGUAGE \"German\"\n  !insertmacro MUI_LANGUAGE \"French\"\n  !insertmacro MUI_LANGUAGE \"SpanishInternational\"\n  !insertmacro MUI_LANGUAGE \"SimpChinese\"\n  !insertmacro MUI_LANGUAGE \"TradChinese\"\n  !insertmacro MUI_LANGUAGE \"Japanese\"\n  !insertmacro MUI_LANGUAGE \"Korean\"\n  !insertmacro MUI_LANGUAGE \"Italian\"\n  !insertmacro MUI_LANGUAGE \"Dutch\"\n  !insertmacro MUI_LANGUAGE \"Danish\"\n  !insertmacro MUI_LANGUAGE \"Swedish\"\n  !insertmacro MUI_LANGUAGE \"Norwegian\"\n  !insertmacro MUI_LANGUAGE \"Finnish\"\n  !insertmacro MUI_LANGUAGE \"Russian\"\n  !insertmacro MUI_LANGUAGE \"Portuguese\"\n  !insertmacro MUI_LANGUAGE \"PortugueseBR\"\n  !insertmacro MUI_LANGUAGE \"Polish\"\n  !insertmacro MUI_LANGUAGE \"Ukrainian\"\n  !insertmacro MUI_LANGUAGE \"Czech\"\n  !insertmacro MUI_LANGUAGE \"Slovak\"\n  !insertmacro MUI_LANGUAGE \"Hungarian\"\n  !insertmacro MUI_LANGUAGE \"Arabic\"\n  !insertmacro MUI_LANGUAGE \"Turkish\"\n  !insertmacro MUI_LANGUAGE \"Thai\"\n  !insertmacro MUI_LANGUAGE \"Vietnamese\"\n!macroend\n\n!addplugindir /x86-unicode \"/home/greg/.cache/electron-builder/nsis/nsis-resources-3.4.1/plugins/x86-unicode\"\n!include \"/tmp/t-R3kv0o/0-messages.nsh\"\n\n!include \"common.nsh\"\n!include \"extractAppPackage.nsh\"\n\n# https://github.com/electron-userland/electron-builder/issues/3972#issuecomment-505171582\nCRCCheck off\nWindowIcon Off\nAutoCloseWindow True\nRequestExecutionLevel ${REQUEST_EXECUTION_LEVEL}\n\nFunction .onInit\n  !ifndef SPLASH_IMAGE\n    SetSilent silent\n  !endif\n\n  !insertmacro check64BitAndSetRegView\nFunctionEnd\n\nFunction .onGUIInit\n  InitPluginsDir\n\n  !ifdef SPLASH_IMAGE\n    File /oname=$PLUGINSDIR\\splash.bmp \"${SPLASH_IMAGE}\"\n    BgImage::SetBg $PLUGINSDIR\\splash.bmp\n    BgImage::Redraw\n  !endif\nFunctionEnd\n\nSection\n  !ifdef SPLASH_IMAGE\n    HideWindow\n  !endif\n\n  StrCpy $INSTDIR \"$PLUGINSDIR\\app\"\n  !ifdef UNPACK_DIR_NAME\n    StrCpy $INSTDIR \"$TEMP\\${UNPACK_DIR_NAME}\"\n  !endif\n\n  RMDir /r $INSTDIR\n  SetOutPath $INSTDIR\n\n  !ifdef APP_DIR_64\n    !ifdef APP_DIR_ARM64\n      !ifdef APP_DIR_32\n        ${if} ${IsNativeARM64}\n          File /r \"${APP_DIR_ARM64}\\*.*\"\n        ${elseif} ${RunningX64}\n          File /r \"${APP_DIR_64}\\*.*\"\n        ${else}\n          File /r \"${APP_DIR_32}\\*.*\"\n        ${endIf}\n      !else\n        ${if} ${IsNativeARM64}\n          File /r \"${APP_DIR_ARM64}\\*.*\"\n        ${else}\n          File /r \"${APP_DIR_64}\\*.*\"\n        {endIf}\n      !endif\n    !else\n      !ifdef APP_DIR_32\n        ${if} ${RunningX64}\n          File /r \"${APP_DIR_64}\\*.*\"\n        ${else}\n          File /r \"${APP_DIR_32}\\*.*\"\n        ${endIf}\n      !else\n        File /r \"${APP_DIR_64}\\*.*\"\n      !endif\n    !endif\n  !else\n    !ifdef APP_DIR_32\n      File /r \"${APP_DIR_32}\\*.*\"\n    !else\n      !insertmacro extractEmbeddedAppPackage\n    !endif\n  !endif\n\n  System::Call 'Kernel32::SetEnvironmentVariable(t, t)i (\"PORTABLE_EXECUTABLE_DIR\", \"$EXEDIR\").r0'\n  System::Call 'Kernel32::SetEnvironmentVariable(t, t)i (\"PORTABLE_EXECUTABLE_FILE\", \"$EXEPATH\").r0'\n  System::Call 'Kernel32::SetEnvironmentVariable(t, t)i (\"PORTABLE_EXECUTABLE_APP_FILENAME\", \"${APP_FILENAME}\").r0'\n  ${StdUtils.GetAllParameters} $R0 0\n\n  !ifdef SPLASH_IMAGE\n    BgImage::Destroy\n  !endif\n\n\tExecWait \"$INSTDIR\\${APP_EXECUTABLE_FILENAME} $R0\" $0\n  SetErrorLevel $0\n\n  SetOutPath $EXEDIR\n\tRMDir /r $INSTDIR\nSectionEnd\n"
diff --git a/examples/desktop/electron/release/casper-webclient_2.0.0_amd64.snap b/examples/desktop/electron/release/casper-webclient_2.0.0_amd64.snap
diff --git a/examples/frontend/angular/dist/casper/assets/casper_rust_wasm_sdk_bg.wasm b/examples/frontend/angular/dist/casper/assets/casper_rust_wasm_sdk_bg.wasm
diff --git a/examples/frontend/angular/dist/casper/highlight.worker.2a6c2f9e6580b078.js b/examples/frontend/angular/dist/casper/highlight.worker.2a6c2f9e6580b078.js
diff --git a/examples/frontend/angular/dist/casper/highlight.worker.c8bc3da14f6b8ab6.js b/examples/frontend/angular/dist/casper/highlight.worker.c8bc3da14f6b8ab6.js
diff --git a/examples/frontend/angular/dist/casper/index.html b/examples/frontend/angular/dist/casper/index.html
@@ -11,5 +11,5 @@
   <style>html,body{display:grid;height:100%;margin:0;padding:0}</style><link rel="stylesheet" href="styles.bae465c3fcf30099.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles.bae465c3fcf30099.css"></noscript></head>
   <body>
     <app-root></app-root>
-  <script src="runtime.e5cca347a00cdd14.js" type="module"></script><script src="polyfills.b7ecd408d58033fa.js" type="module"></script><script src="main.c4268bfbff1c8e77.js" type="module"></script></body>
+  <script src="runtime.2df62927b58c3bb6.js" type="module"></script><script src="polyfills.b7ecd408d58033fa.js" type="module"></script><script src="main.5c9ef318d0f31fa9.js" type="module"></script></body>
 </html>
diff --git a/examples/frontend/angular/dist/casper/main.5c9ef318d0f31fa9.js b/examples/frontend/angular/dist/casper/main.5c9ef318d0f31fa9.js
diff --git a/examples/frontend/angular/dist/casper/main.c4268bfbff1c8e77.js b/examples/frontend/angular/dist/casper/main.c4268bfbff1c8e77.js
diff --git a/...r/dist/casper/runtime.e5cca347a00cdd14.js → ...r/dist/casper/runtime.2df62927b58c3bb6.js b/...r/dist/casper/runtime.e5cca347a00cdd14.js → ...r/dist/casper/runtime.2df62927b58c3bb6.js
diff --git a/examples/frontend/angular/libs/util/config/src/config.ts b/examples/frontend/angular/libs/util/config/src/config.ts
@@ -14,7 +14,7 @@ export const config: EnvironmentConfig = {
   minimum_transfer: '2500000000',
   TTL: '30m',
   standard_payment_amount: '100000000',
-  default_pricing_mode: PricingMode.Fixed,
+  default_pricing_mode: PricingMode.Classic,
   default_gas_price_tolerance: '1',
   default_additional_computation_factor: '0',
   default_is_install_upgrade: true,

diff --git a/examples/frontend/angular/libs/util/services/client/src/lib/client.service.ts b/examples/frontend/angular/libs/util/services/client/src/lib/client.service.ts
@@ -427,6 +427,7 @@ export class ClientService {
     const gas_price_tolerance: string = this.getIdentifier('gasPriceTolerance')?.value?.trim() || '';
     const pricing_mode: PricingMode = this.getIdentifier('selectPricingMode')?.value?.trim() || '';
     const additional_computation_factor: string = this.getIdentifier('additionalComputationFactor')?.value?.trim() || '';
+
     if (!deploy_result && !this.public_key) {
       const err = "public_key is missing";
       err && (this.errorService.setError(err.toString()));
@@ -526,6 +527,7 @@ export class ClientService {
       err && (this.errorService.setError(err.toString()));
       return;
     }
+
     const wasmBuffer = wasm?.buffer;
     if (!wasmBuffer) {
       const err = "wasmBuffer is missing";
@@ -561,6 +563,7 @@ export class ClientService {
       err && (this.errorService.setError(err.toString()));
       return;
     }
+
     const wasmBuffer = wasm?.buffer;
     if (!wasmBuffer) {
       const err = "wasmBuffer is missing";
@@ -575,6 +578,17 @@ export class ClientService {
     transaction_params.payment_amount = payment_amount;
     transaction_params = this.addTransactionArgs(transaction_params);
 
+    const gas_price_tolerance: string = this.getIdentifier('gasPriceTolerance')?.value?.trim() || '';
+    const pricing_mode: PricingMode = this.getIdentifier('selectPricingMode')?.value?.trim() || '';
+    const additional_computation_factor: string = this.getIdentifier('additionalComputationFactor')?.value?.trim() || '';
+
+    gas_price_tolerance && (transaction_params.gas_price_tolerance = gas_price_tolerance);
+    pricing_mode && (transaction_params.pricing_mode = pricing_mode);
+
+    if (pricing_mode == PricingMode.Fixed) {
+      transaction_params.additional_computation_factor = additional_computation_factor;
+    }
+
     try {
       const install = wasm && await this.sdk.install(
         transaction_params,

diff --git a/examples/frontend/angular/src/app/app.component.ts b/examples/frontend/angular/src/app/app.component.ts
@@ -188,4 +188,28 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
     let transaction = await this.clientService.transaction(false, true, this.wasm) as Transaction;
     return await this.binaryService.get_binary_try_speculative_execution(transaction);
   }
+
+  private async install_deploy() {
+    return await this.clientService.install_deploy(this.wasm);
+  }
+
+  private async install() {
+    return await this.clientService.install(this.wasm);
+  }
+
+  private async make_deploy() {
+    return await this.clientService.make_deploy(this.wasm);
+  }
+
+  private async make_transaction() {
+    return await this.clientService.make_transaction(this.wasm);
+  }
+
+  private async speculative_deploy() {
+    return await this.clientService.speculative_deploy(this.wasm);
+  }
+
+  private async speculative_transaction() {
+    return await this.clientService.speculative_transaction(this.wasm);
+  }
 }