@mysten/sui 1.44.0 → 1.45.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @mysten/sui.js
 
+## 1.45.1
+
+### Patch Changes
+
+- e3811f1: update valibot
+
+## 1.45.0
+
+### Minor Changes
+
+- 88bdbac: Add TranasctionData.insertTransaction method
+
 ## 1.44.0
 
 ### Minor Changes

package/dist/cjs/transactions/Arguments.d.ts

@@ -29,8 +29,8 @@ export declare const Arguments: {
         type?: "object";
     };
     objectRef: (args_0: {
-        version: string | number;
         objectId: string;
+        version: string | number;
         digest: string;
     }) => (tx: Transaction) => {
         $kind: "Input";
@@ -38,8 +38,8 @@ export declare const Arguments: {
         type?: "object";
     };
     receivingRef: (args_0: {
-        version: string | number;
         objectId: string;
+        version: string | number;
         digest: string;
     }) => (tx: Transaction) => {
         $kind: "Input";

package/dist/cjs/transactions/Transaction.d.ts

@@ -80,29 +80,47 @@ export declare class Transaction {
     /** @deprecated Use `getData()` instead. */
     get blockData(): {
         version: 1;
+        sender?: string | undefined;
+        expiration?: {
+            Epoch: number;
+        } | {
+            None: true | null;
+        } | null | undefined;
+        gasConfig: {
+            budget?: string | number | bigint | undefined;
+            price?: string | number | bigint | undefined;
+            payment?: {
+                digest: string;
+                objectId: string;
+                version: string | number | bigint;
+            }[] | undefined;
+            owner?: string | undefined;
+        };
         inputs: ({
             kind: "Input";
-            value: unknown;
             index: number;
+            value: unknown;
             type?: "object" | undefined;
         } | {
-            type: "pure";
             kind: "Input";
-            value: unknown;
             index: number;
+            value: unknown;
+            type: "pure";
         })[];
         transactions: ({
+            kind: "MoveCall";
+            target: `${string}::${string}::${string}`;
             typeArguments: string[];
             arguments: ({
                 kind: "Input";
-                value: unknown;
                 index: number;
+                value: unknown;
                 type?: "object" | undefined;
             } | {
-                type: "pure";
                 kind: "Input";
-                value: unknown;
                 index: number;
+                value: unknown;
+                type: "pure";
             } | {
                 kind: "GasCoin";
             } | {
@@ -113,19 +131,18 @@ export declare class Transaction {
                 index: number;
                 resultIndex: number;
             })[];
-            kind: "MoveCall";
-            target: `${string}::${string}::${string}`;
         } | {
-            address: {
+            kind: "TransferObjects";
+            objects: ({
                 kind: "Input";
-                value: unknown;
                 index: number;
+                value: unknown;
                 type?: "object" | undefined;
             } | {
-                type: "pure";
                 kind: "Input";
-                value: unknown;
                 index: number;
+                value: unknown;
+                type: "pure";
             } | {
                 kind: "GasCoin";
             } | {
@@ -135,17 +152,17 @@ export declare class Transaction {
                 kind: "NestedResult";
                 index: number;
                 resultIndex: number;
-            };
-            objects: ({
+            })[];
+            address: {
                 kind: "Input";
-                value: unknown;
                 index: number;
+                value: unknown;
                 type?: "object" | undefined;
             } | {
-                type: "pure";
                 kind: "Input";
-                value: unknown;
                 index: number;
+                value: unknown;
+                type: "pure";
             } | {
                 kind: "GasCoin";
             } | {
@@ -155,19 +172,19 @@ export declare class Transaction {
                 kind: "NestedResult";
                 index: number;
                 resultIndex: number;
-            })[];
-            kind: "TransferObjects";
+            };
         } | {
+            kind: "SplitCoins";
             coin: {
                 kind: "Input";
-                value: unknown;
                 index: number;
+                value: unknown;
                 type?: "object" | undefined;
             } | {
-                type: "pure";
                 kind: "Input";
-                value: unknown;
                 index: number;
+                value: unknown;
+                type: "pure";
             } | {
                 kind: "GasCoin";
             } | {
@@ -180,14 +197,14 @@ export declare class Transaction {
             };
             amounts: ({
                 kind: "Input";
-                value: unknown;
                 index: number;
+                value: unknown;
                 type?: "object" | undefined;
             } | {
-                type: "pure";
                 kind: "Input";
-                value: unknown;
                 index: number;
+                value: unknown;
+                type: "pure";
             } | {
                 kind: "GasCoin";
             } | {
@@ -198,18 +215,18 @@ export declare class Transaction {
                 index: number;
                 resultIndex: number;
             })[];
-            kind: "SplitCoins";
         } | {
+            kind: "MergeCoins";
             destination: {
                 kind: "Input";
-                value: unknown;
                 index: number;
+                value: unknown;
                 type?: "object" | undefined;
             } | {
-                type: "pure";
                 kind: "Input";
-                value: unknown;
                 index: number;
+                value: unknown;
+                type: "pure";
             } | {
                 kind: "GasCoin";
             } | {
@@ -222,14 +239,14 @@ export declare class Transaction {
             };
             sources: ({
                 kind: "Input";
-                value: unknown;
                 index: number;
+                value: unknown;
                 type?: "object" | undefined;
             } | {
-                type: "pure";
                 kind: "Input";
-                value: unknown;
                 index: number;
+                value: unknown;
+                type: "pure";
             } | {
                 kind: "GasCoin";
             } | {
@@ -240,18 +257,23 @@ export declare class Transaction {
                 index: number;
                 resultIndex: number;
             })[];
-            kind: "MergeCoins";
         } | {
+            kind: "MakeMoveVec";
+            type: {
+                Some: import("../bcs/types.js").TypeTag;
+            } | {
+                None: true | null;
+            };
             objects: ({
                 kind: "Input";
-                value: unknown;
                 index: number;
+                value: unknown;
                 type?: "object" | undefined;
             } | {
-                type: "pure";
                 kind: "Input";
-                value: unknown;
                 index: number;
+                value: unknown;
+                type: "pure";
             } | {
                 kind: "GasCoin";
             } | {
@@ -262,29 +284,25 @@ export declare class Transaction {
                 index: number;
                 resultIndex: number;
             })[];
-            type: {
-                Some: import("../bcs/types.js").TypeTag;
-            } | {
-                None: true | null;
-            };
-            kind: "MakeMoveVec";
         } | {
+            kind: "Publish";
             modules: number[][];
             dependencies: string[];
-            kind: "Publish";
         } | {
+            kind: "Upgrade";
             modules: number[][];
             dependencies: string[];
+            packageId: string;
             ticket: {
                 kind: "Input";
-                value: unknown;
                 index: number;
+                value: unknown;
                 type?: "object" | undefined;
             } | {
-                type: "pure";
                 kind: "Input";
-                value: unknown;
                 index: number;
+                value: unknown;
+                type: "pure";
             } | {
                 kind: "GasCoin";
             } | {
@@ -295,34 +313,31 @@ export declare class Transaction {
                 index: number;
                 resultIndex: number;
             };
-            kind: "Upgrade";
-            packageId: string;
         })[];
-        gasConfig: {
-            owner?: string | undefined;
-            payment?: {
-                version: string | number | bigint;
-                objectId: string;
-                digest: string;
-            }[] | undefined;
-            price?: string | number | bigint | undefined;
-            budget?: string | number | bigint | undefined;
-        };
-        sender?: string | undefined;
-        expiration?: {
-            Epoch: number;
-        } | {
-            None: true | null;
-        } | null | undefined;
     };
     /** Get a snapshot of the transaction data, in JSON form: */
     getData(): {
         version: 2;
+        sender?: string | null | undefined;
+        expiration?: import("@mysten/bcs").EnumOutputShapeWithKeys<{
+            None: true;
+            Epoch: string | number;
+        }, "None" | "Epoch"> | null | undefined;
+        gasData: {
+            budget: string | number | null;
+            price: string | number | null;
+            owner: string | null;
+            payment: {
+                objectId: string;
+                version: string | number;
+                digest: string;
+            }[] | null;
+        };
         inputs: import("@mysten/bcs").EnumOutputShapeWithKeys<{
             Object: import("@mysten/bcs").EnumOutputShapeWithKeys<{
                 ImmOrOwnedObject: {
-                    version: string | number;
                     objectId: string;
+                    version: string | number;
                     digest: string;
                 };
                 SharedObject: {
@@ -331,8 +346,8 @@ export declare class Transaction {
                     mutable: boolean;
                 };
                 Receiving: {
-                    version: string | number;
                     objectId: string;
+                    version: string | number;
                     digest: string;
                 };
             }, "ImmOrOwnedObject" | "SharedObject" | "Receiving">;
@@ -352,9 +367,9 @@ export declare class Transaction {
         }, "Pure" | "Object" | "UnresolvedPure" | "UnresolvedObject">[];
         commands: import("@mysten/bcs").EnumOutputShapeWithKeys<{
             MoveCall: {
-                function: string;
-                module: string;
                 package: string;
+                module: string;
+                function: string;
                 typeArguments: string[];
                 arguments: ({
                     $kind: "GasCoin";
@@ -380,7 +395,7 @@ export declare class Transaction {
                 }[] | null | undefined;
             };
             TransferObjects: {
-                address: {
+                objects: ({
                     $kind: "GasCoin";
                     GasCoin: true;
                 } | {
@@ -397,8 +412,8 @@ export declare class Transaction {
                 } | {
                     $kind: "NestedResult";
                     NestedResult: [number, number];
-                };
-                objects: ({
+                })[];
+                address: {
                     $kind: "GasCoin";
                     GasCoin: true;
                 } | {
@@ -415,7 +430,7 @@ export declare class Transaction {
                 } | {
                     $kind: "NestedResult";
                     NestedResult: [number, number];
-                })[];
+                };
             };
             SplitCoins: {
                 coin: {
@@ -519,9 +534,9 @@ export declare class Transaction {
                 })[];
             };
             Upgrade: {
-                package: string;
                 modules: string[];
                 dependencies: string[];
+                package: string;
                 ticket: {
                     $kind: "GasCoin";
                     GasCoin: true;
@@ -585,21 +600,6 @@ export declare class Transaction {
                 };
             };
         }, "MoveCall" | "TransferObjects" | "SplitCoins" | "MergeCoins" | "Publish" | "MakeMoveVec" | "Upgrade" | "$Intent">[];
-        gasData: {
-            owner: string | null;
-            payment: {
-                version: string | number;
-                objectId: string;
-                digest: string;
-            }[] | null;
-            price: string | number | null;
-            budget: string | number | null;
-        };
-        sender?: string | null | undefined;
-        expiration?: import("@mysten/bcs").EnumOutputShapeWithKeys<{
-            None: true;
-            Epoch: string | number;
-        }, "None" | "Epoch"> | null | undefined;
     };
     get pure(): ReturnType<typeof createPure<Argument>>;
     constructor();

package/dist/cjs/transactions/TransactionData.d.ts

@@ -2,6 +2,7 @@ import type { InferInput } from 'valibot';
 import type { Argument, CallArg, Command, GasData, TransactionExpiration, TransactionData } from './data/internal.js';
 import type { SerializedTransactionDataV1 } from './data/v1.js';
 import type { SerializedTransactionDataV2Schema } from './data/v2.js';
+import type { TransactionResult } from './Transaction.js';
 export declare class TransactionDataBuilder implements TransactionData {
     static fromKindBytes(bytes: Uint8Array): TransactionDataBuilder;
     static fromBytes(bytes: Uint8Array): TransactionDataBuilder;
@@ -14,24 +15,24 @@ export declare class TransactionDataBuilder implements TransactionData {
      */
     static getDigestFromBytes(bytes: Uint8Array): string;
     get gasConfig(): {
+        budget: string | number | null;
+        price: string | number | null;
         owner: string | null;
         payment: {
-            version: string | number;
             objectId: string;
+            version: string | number;
             digest: string;
         }[] | null;
-        price: string | number | null;
-        budget: string | number | null;
     };
     set gasConfig(value: {
+        budget: string | number | null;
+        price: string | number | null;
         owner: string | null;
         payment: {
-            version: string | number;
             objectId: string;
+            version: string | number;
             digest: string;
         }[] | null;
-        price: string | number | null;
-        budget: string | number | null;
     });
     version: 2;
     sender: string | null;
@@ -58,7 +59,13 @@ export declare class TransactionDataBuilder implements TransactionData {
     getInputUses(index: number, fn: (arg: Argument, command: Command) => void): void;
     mapCommandArguments(index: number, fn: (arg: Argument, command: Command, commandIndex: number) => Argument): void;
     mapArguments(fn: (arg: Argument, command: Command, commandIndex: number) => Argument): void;
-    replaceCommand(index: number, replacement: Command | Command[], resultIndex?: number): void;
+    replaceCommand(index: number, replacement: Command | Command[], resultIndex?: number | {
+        Result: number;
+    } | {
+        NestedResult: [number, number];
+    }): void;
+    replaceCommandWithTransaction(index: number, otherTransaction: TransactionData, result: TransactionResult): void;
+    insertTransaction(atCommandIndex: number, otherTransaction: TransactionData): void;
     getDigest(): string;
     snapshot(): TransactionData;
     shallowClone(): TransactionDataBuilder;

package/dist/cjs/transactions/TransactionData.js

@@ -28,6 +28,7 @@ var import_sui_types = require("../utils/sui-types.js");
 var import_internal = require("./data/internal.js");
 var import_v1 = require("./data/v1.js");
 var import_hash = require("./hash.js");
+var import_utils = require("./utils.js");
 function prepareSuiAddress(address) {
   return (0, import_sui_types.normalizeSuiAddress)(address).replace("0x", "");
 }
@@ -229,26 +230,107 @@ class TransactionDataBuilder {
       return;
     }
     const sizeDiff = replacement.length - 1;
-    this.commands.splice(index, 1, ...replacement);
-    if (sizeDiff !== 0) {
+    this.commands.splice(index, 1, ...structuredClone(replacement));
+    this.mapArguments((arg, _command, commandIndex) => {
+      if (commandIndex < index + replacement.length) {
+        return arg;
+      }
+      if (typeof resultIndex !== "number") {
+        if (arg.$kind === "Result" && arg.Result === index || arg.$kind === "NestedResult" && arg.NestedResult[0] === index) {
+          if (!("NestedResult" in arg) || arg.NestedResult[1] === 0) {
+            return (0, import_valibot.parse)(import_internal.ArgumentSchema, structuredClone(resultIndex));
+          } else {
+            throw new Error(
+              `Cannot replace command ${index} with a specific result type: NestedResult[${index}, ${arg.NestedResult[1]}] references a nested element that cannot be mapped to the replacement result`
+            );
+          }
+        }
+      }
+      switch (arg.$kind) {
+        case "Result":
+          if (arg.Result === index && typeof resultIndex === "number") {
+            arg.Result = resultIndex;
+          }
+          if (arg.Result > index) {
+            arg.Result += sizeDiff;
+          }
+          break;
+        case "NestedResult":
+          if (arg.NestedResult[0] === index && typeof resultIndex === "number") {
+            return {
+              $kind: "NestedResult",
+              NestedResult: [resultIndex, arg.NestedResult[1]]
+            };
+          }
+          if (arg.NestedResult[0] > index) {
+            arg.NestedResult[0] += sizeDiff;
+          }
+          break;
+      }
+      return arg;
+    });
+  }
+  replaceCommandWithTransaction(index, otherTransaction, result) {
+    if (result.$kind !== "Result" && result.$kind !== "NestedResult") {
+      throw new Error("Result must be of kind Result or NestedResult");
+    }
+    this.insertTransaction(index, otherTransaction);
+    this.replaceCommand(
+      index + otherTransaction.commands.length,
+      [],
+      "Result" in result ? { NestedResult: [result.Result + index, 0] } : {
+        NestedResult: [
+          result.NestedResult[0] + index,
+          result.NestedResult[1]
+        ]
+      }
+    );
+  }
+  insertTransaction(atCommandIndex, otherTransaction) {
+    const inputMapping = /* @__PURE__ */ new Map();
+    const commandMapping = /* @__PURE__ */ new Map();
+    for (let i = 0; i < otherTransaction.inputs.length; i++) {
+      const otherInput = otherTransaction.inputs[i];
+      const id = (0, import_utils.getIdFromCallArg)(otherInput);
+      let existingIndex = -1;
+      if (id !== void 0) {
+        existingIndex = this.inputs.findIndex((input) => (0, import_utils.getIdFromCallArg)(input) === id);
+        if (existingIndex !== -1 && this.inputs[existingIndex].Object?.SharedObject && otherInput.Object?.SharedObject) {
+          this.inputs[existingIndex].Object.SharedObject.mutable = this.inputs[existingIndex].Object.SharedObject.mutable || otherInput.Object.SharedObject.mutable;
+        }
+      }
+      if (existingIndex !== -1) {
+        inputMapping.set(i, existingIndex);
+      } else {
+        const newIndex = this.inputs.length;
+        this.inputs.push(otherInput);
+        inputMapping.set(i, newIndex);
+      }
+    }
+    for (let i = 0; i < otherTransaction.commands.length; i++) {
+      commandMapping.set(i, atCommandIndex + i);
+    }
+    const remappedCommands = [];
+    for (let i = 0; i < otherTransaction.commands.length; i++) {
+      const command = structuredClone(otherTransaction.commands[i]);
+      (0, import_utils.remapCommandArguments)(command, inputMapping, commandMapping);
+      remappedCommands.push(command);
+    }
+    this.commands.splice(atCommandIndex, 0, ...remappedCommands);
+    const sizeDiff = remappedCommands.length;
+    if (sizeDiff > 0) {
       this.mapArguments((arg, _command, commandIndex) => {
-        if (commandIndex < index + replacement.length) {
+        if (commandIndex >= atCommandIndex && commandIndex < atCommandIndex + remappedCommands.length) {
           return arg;
         }
         switch (arg.$kind) {
           case "Result":
-            if (arg.Result === index) {
-              arg.Result = resultIndex;
-            }
-            if (arg.Result > index) {
+            if (arg.Result >= atCommandIndex) {
               arg.Result += sizeDiff;
             }
             break;
           case "NestedResult":
-            if (arg.NestedResult[0] === index) {
-              arg.NestedResult[0] = resultIndex;
-            }
-            if (arg.NestedResult[0] > index) {
+            if (arg.NestedResult[0] >= atCommandIndex) {
               arg.NestedResult[0] += sizeDiff;
             }
             break;