feat: allow to evaluate args

unit214 · Dec 12, 2024 · 5bad97e · 5bad97e
1 parent 5cd2591
commit 5bad97e
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 29 deletions.
diff --git a/src/components/Call.vue b/src/components/Call.vue
@@ -96,14 +96,20 @@
       </div>
       <div class="mx-2 w-2/3">
         <label class="text-xs block mb-1" for="args">Arguments</label>
-        <input
-          id="args"
-          v-model="callData.args"
-          class="w-full p-2"
-          type="text"
-          placeholder="comma separated args"
-          @keydown.enter="callContract"
-        />
+        <div class="flex flex-row">
+          <input
+            id="args"
+            v-model="callData.args"
+            class="w-full p-2"
+            type="text"
+            placeholder="comma separated args (using eval as array)"
+            @keydown.enter="callContract"
+          />
+          <div class="ml-2 flex flex-col">
+            <label class="text-xs block mb-1" for="staticEval">Eval</label>
+            <input id="staticEval" v-model="callData.eval" type="checkbox" />
+          </div>
+        </div>
       </div>
     </div>
 

diff --git a/src/components/CallStatic.vue b/src/components/CallStatic.vue
@@ -31,14 +31,24 @@
     <div class="flex -mx-2 mt-4 mb-4">
       <div class="mx-2 w-full">
         <label class="text-xs block mb-1" for="staticArgs">Arguments</label>
-        <input
-          id="staticArgs"
-          v-model="callStaticData.args"
-          class="w-full p-2"
-          type="text"
-          placeholder="comma separated args"
-          @keydown.enter="callContractStatic"
-        />
+        <div class="flex flex-row">
+          <input
+            id="staticArgs"
+            v-model="callStaticData.args"
+            class="w-full p-2"
+            type="text"
+            placeholder="comma separated args (using eval as array)"
+            @keydown.enter="callContractStatic"
+          />
+          <div class="ml-2 flex flex-col">
+            <label class="text-xs block mb-1" for="staticEval">Eval</label>
+            <input
+              id="staticEval"
+              v-model="callStaticData.eval"
+              type="checkbox"
+            />
+          </div>
+        </div>
       </div>
     </div>
 

diff --git a/src/components/DecodedEvents.vue b/src/components/DecodedEvents.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <span class="text-xs block mb-1 font-bold" v-if="result?.events?.length">
+    <span v-if="result?.events?.length" class="text-xs block mb-1 font-bold">
       Events:
     </span>
     <span

diff --git a/src/components/Deploy.vue b/src/components/Deploy.vue
@@ -30,14 +30,20 @@
       </div>
       <div class="mx-2 w-2/3">
         <label class="text-xs block mb-1" for="deployArgs">Arguments</label>
-        <input
-          id="deployArgs"
-          v-model="deployData.args"
-          class="w-full p-2"
-          type="text"
-          placeholder="comma separated args"
-          @keydown.enter="deployContract"
-        />
+        <div class="flex flex-row">
+          <input
+            id="deployArgs"
+            v-model="deployData.args"
+            class="w-full p-2"
+            type="text"
+            placeholder="comma separated args (using eval as array)"
+            @keydown.enter="deployContract"
+          />
+          <div class="ml-2 flex flex-col">
+            <label class="text-xs block mb-1" for="staticEval">Eval</label>
+            <input id="staticEval" v-model="deployData.eval" type="checkbox" />
+          </div>
+        </div>
       </div>
     </div>
     <div class="flex -mx-2 mt-4 mb-4">

diff --git a/src/stores/contractStore.ts b/src/stores/contractStore.ts
@@ -24,6 +24,7 @@ export const useContractStore = defineStore("contract", () => {
     bytecode: string;
     aci: string;
     args: string;
+    eval: boolean;
     options: {
       amount: number;
       callData: string;
@@ -35,19 +36,27 @@ export const useContractStore = defineStore("contract", () => {
     bytecode: "",
     aci: "",
     args: "",
+    eval: false,
     options: structuredClone(defaultCallOptions),
   });
   const deployResult: Ref<Result<string>> = ref(new Result<string>());
 
-  const callStaticData: Ref<{ args: string; func: string; gas: number }> = ref({
+  const callStaticData: Ref<{
+    args: string;
+    func: string;
+    gas: number;
+    eval: boolean;
+  }> = ref({
     func: "example",
     gas: 1000000,
     args: "",
+    eval: false,
   });
   const callStaticResult: Ref<Result<string>> = ref(new Result<string>());
 
   const callData: Ref<{
     args: string;
+    eval: boolean;
     func: string;
     options: {
       amount: number;
@@ -59,6 +68,7 @@ export const useContractStore = defineStore("contract", () => {
   }> = ref({
     func: "example",
     args: "",
+    eval: false,
     options: structuredClone(defaultCallOptions),
   });
   const callResult: Ref<Result<string>> = ref(new Result<string>());
@@ -137,7 +147,9 @@ export const useContractStore = defineStore("contract", () => {
   async function deployContract() {
     resetDeployAndCallData(false);
     deployResult.value.setInfo("Deploying Contract ...");
-    const args = argsStringToArgs(deployData.value.args);
+    const args = deployData.value.eval
+      ? eval(deployData.value.args)
+      : argsStringToArgs(deployData.value.args);
 
     contractInstance = await Contract.initialize({
       ...sdkStore.aeSdk.getContext(),
@@ -167,7 +179,9 @@ export const useContractStore = defineStore("contract", () => {
 
   async function callContractStatic() {
     callStaticResult.value.setInfo("Dry-Running ...");
-    const args = argsStringToArgs(callStaticData.value.args);
+    const args = callStaticData.value.eval
+      ? eval(callStaticData.value.args)
+      : argsStringToArgs(callStaticData.value.args);
     const options = { callStatic: true, gas: callStaticData.value.gas };
 
     contractInstance
@@ -191,7 +205,10 @@ export const useContractStore = defineStore("contract", () => {
 
   async function callContract() {
     callResult.value.setInfo("Calling Contract ...");
-    const args = argsStringToArgs(callData.value.args);
+
+    const args = callData.value.eval
+      ? eval(callData.value.args)
+      : argsStringToArgs(callData.value.args);
     const options = Object.fromEntries(
       Object.entries(callData.value.options).filter(([, v]) => v != null),
     );
@@ -236,6 +253,7 @@ export const useContractStore = defineStore("contract", () => {
       deployData.value = {
         aci: "",
         args: "",
+        eval: false,
         bytecode: "",
         options: structuredClone(defaultCallOptions),
       };
@@ -246,12 +264,14 @@ export const useContractStore = defineStore("contract", () => {
       func: "example",
       gas: 1000000,
       args: "",
+      eval: false,
     };
     callStaticResult.value = new Result();
 
     callData.value = {
       func: "example",
       args: "",
+      eval: false,
       options: structuredClone(defaultCallOptions),
     };
     callResult.value = new Result();