bug fix

zktx-io · Jan 14, 2025 · 2581e13 · 2581e13
1 parent d846d8a
commit 2581e13
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 22 deletions.
diff --git a/packages/ptb-builder/src/ptbFlow/nodes/commands/MoveCall.tsx b/packages/ptb-builder/src/ptbFlow/nodes/commands/MoveCall.tsx
@@ -88,13 +88,15 @@ export const MoveCall = ({ id, data }: PTBNodeProp) => {
             selectedTypeArgs,
           ),
         );
-        convertParams(
-          'source',
-          'result',
-          ptbModuleData.modules[moveCallData.module].exposedFunctions[
-            moveCallData.function
-          ].return,
-          selectedTypeArgs,
+        setSelectedOutputs(
+          convertParams(
+            'source',
+            'result',
+            ptbModuleData.modules[moveCallData.module].exposedFunctions[
+              moveCallData.function
+            ].return,
+            selectedTypeArgs,
+          ),
         );
       }
       setNodes((nds) =>

diff --git a/packages/ptb-builder/src/utilities/ptb/generateCode.ts b/packages/ptb-builder/src/utilities/ptb/generateCode.ts
@@ -8,6 +8,9 @@ const connvert = (
   if (!id) {
     return 'undefined';
   }
+  if (id.endsWith('[]')) {
+    return dictionary[id.replace('[]', '')].name;
+  }
   const match = id.match(/\[(\d+)\]$/);
   if (match) {
     return `${dictionary[id.replace(match[0], '')].name}[${match[1]}]`;
@@ -56,7 +59,7 @@ const genereateCommand = (
     case PTBNodeType.SplitCoins:
       if (inputs[1].length === 1) {
         if (inputs[1][0].endsWith('[]')) {
-          return `tx.splitCoins(${connvert(inputs[0], dictionary)}, ${connvert(inputs[1][0], dictionary)})`;
+          return `tx.splitCoins([${connvert(inputs[0], dictionary)}], ${connvert(inputs[1][0], dictionary)})`;
         }
         return `tx.splitCoins(${connvert(inputs[0], dictionary)}, [${connvert(inputs[1][0], dictionary)}])`;
       } else {
@@ -65,7 +68,7 @@ const genereateCommand = (
     case PTBNodeType.MergeCoins:
       if (inputs[1].length === 1) {
         if (inputs[1][0].endsWith('[]')) {
-          return `tx.mergeCoins(${connvert(inputs[0], dictionary)}, ${connvert(inputs[1][0], dictionary)})`;
+          return `tx.mergeCoins([${connvert(inputs[0], dictionary)}], ${connvert(inputs[1][0], dictionary)})`;
         }
         return `tx.mergeCoins(${connvert(inputs[0], dictionary)}, [${connvert(inputs[1][0], dictionary)}])`;
       } else {

diff --git a/packages/ptb-builder/src/utilities/ptb/generateTxb.ts b/packages/ptb-builder/src/utilities/ptb/generateTxb.ts
@@ -37,6 +37,9 @@ const connvert = (
   if (!id) {
     return undefined;
   }
+  if (id.endsWith('[]')) {
+    return dictionary[id.replace('[]', '')];
+  }
   const match = id.match(/\[(\d+)\]$/);
   if (match) {
     const data = dictionary[id.replace(`${match[0]}`, '')];
@@ -74,20 +77,18 @@ const genereateCommand = (
         );
         return {
           tx,
-          nestedResults: (amounts as any[]).map(
-            (_, i) => result[i] as NestedResult,
-          ),
+          nestedResults:
+            node.data.splitInputs === undefined
+              ? result
+              : (amounts as any[]).map((_, i) => result[i] as NestedResult),
         };
       }
       case PTBNodeType.MergeCoins: {
         const destination = connvert(inputs[0], dictionary);
         let sources;
         if (inputs[1].length === 1) {
-          if (inputs[1][0].endsWith('[]')) {
-            sources = connvert(inputs[1][0], dictionary);
-          } else {
-            sources = [connvert(inputs[1][0], dictionary)];
-          }
+          const temp = connvert(inputs[1][0], dictionary);
+          sources = Array.isArray(temp) ? temp : [temp];
         } else {
           sources = inputs[1].map((v) => connvert(v, dictionary));
         }
@@ -101,11 +102,8 @@ const genereateCommand = (
         const address = connvert(inputs[0], dictionary);
         let objects;
         if (inputs[1].length === 1) {
-          if (inputs[1][0].endsWith('[]')) {
-            objects = connvert(inputs[1][0], dictionary);
-          } else {
-            objects = [connvert(inputs[1][0], dictionary)];
-          }
+          const temp = connvert(inputs[1][0], dictionary);
+          objects = Array.isArray(temp) ? temp : [temp];
         } else {
           objects = inputs[1].map((v) => connvert(v, dictionary));
         }