Some feat/ts-move-calls extensions (#1509)

Remove npm dependency @iota/iota-sdk from iota_interaction_ts package.json and use @iota/iota.js instead
iotaledger · Jan 23, 2025 · 0176037 · 0176037
1 parent 5c0bf24
commit 0176037
Show file tree

Hide file tree

Showing 21 changed files with 34 additions and 30 deletions.
diff --git a/bindings/wasm/iota_interaction_ts/lib/move_calls/asset/create.ts b/bindings/wasm/iota_interaction_ts/lib/move_calls/asset/create.ts
@@ -1,7 +1,7 @@
 // Copyright 2020-2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { Transaction } from "@iota/iota-sdk/transactions";
+import { Transaction } from "@iota/iota.js/transactions";
 
 export function create(
     inner_bytes: Uint8Array,

diff --git a/bindings/wasm/iota_interaction_ts/lib/move_calls/asset/delete.ts b/bindings/wasm/iota_interaction_ts/lib/move_calls/asset/delete.ts
@@ -1,7 +1,7 @@
 // Copyright 2020-2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { ObjectRef, Transaction } from "@iota/iota-sdk/transactions";
+import { ObjectRef, Transaction } from "@iota/iota.js/transactions";
 
 export function remove(
     asset: ObjectRef,

diff --git a/bindings/wasm/iota_interaction_ts/lib/move_calls/asset/transfer.ts b/bindings/wasm/iota_interaction_ts/lib/move_calls/asset/transfer.ts
@@ -1,8 +1,8 @@
 // Copyright 2020-2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { SharedObjectRef } from "@iota/iota-sdk/dist/cjs/bcs/types";
-import { ObjectRef, Transaction } from "@iota/iota-sdk/transactions";
+import { SharedObjectRef } from "@iota/iota.js/dist/cjs/bcs/types";
+import { ObjectRef, Transaction } from "@iota/iota.js/transactions";
 
 export function transfer(
     asset: ObjectRef,

diff --git a/bindings/wasm/iota_interaction_ts/lib/move_calls/asset/update.ts b/bindings/wasm/iota_interaction_ts/lib/move_calls/asset/update.ts
@@ -1,7 +1,7 @@
 // Copyright 2020-2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { ObjectRef, Transaction } from "@iota/iota-sdk/transactions";
+import { ObjectRef, Transaction } from "@iota/iota.js/transactions";
 
 export function update(
     asset: ObjectRef,

diff --git a/bindings/wasm/iota_interaction_ts/lib/move_calls/identity/borrow_asset.ts b/bindings/wasm/iota_interaction_ts/lib/move_calls/identity/borrow_asset.ts
@@ -1,9 +1,9 @@
 // Copyright 2020-2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { SharedObjectRef } from "@iota/iota-sdk/dist/cjs/bcs/types";
-import { IotaObjectData } from "@iota/iota-sdk/dist/cjs/client";
-import { ObjectRef, Transaction, TransactionArgument } from "@iota/iota-sdk/transactions";
+import { SharedObjectRef } from "@iota/iota.js/dist/cjs/bcs/types";
+import { IotaObjectData } from "@iota/iota.js/dist/cjs/client";
+import { ObjectRef, Transaction, TransactionArgument } from "@iota/iota.js/transactions";
 import { getControllerDelegation, putBackDelegationToken } from "../utils";
 
 export function proposeBorrow(

diff --git a/bindings/wasm/iota_interaction_ts/lib/move_calls/identity/config.ts b/bindings/wasm/iota_interaction_ts/lib/move_calls/identity/config.ts
@@ -1,8 +1,8 @@
 // Copyright 2020-2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { SharedObjectRef } from "@iota/iota-sdk/dist/cjs/bcs/types";
-import { ObjectRef, Transaction } from "@iota/iota-sdk/transactions";
+import { SharedObjectRef } from "@iota/iota.js/dist/cjs/bcs/types";
+import { ObjectRef, Transaction } from "@iota/iota.js/transactions";
 import { getControllerDelegation, putBackDelegationToken } from "../utils";
 
 export function proposeConfigChange(

diff --git a/bindings/wasm/iota_interaction_ts/lib/move_calls/identity/controller_execution.ts b/bindings/wasm/iota_interaction_ts/lib/move_calls/identity/controller_execution.ts
@@ -1,8 +1,8 @@
 // Copyright 2020-2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { SharedObjectRef } from "@iota/iota-sdk/dist/cjs/bcs/types";
-import { ObjectRef, Transaction, TransactionArgument } from "@iota/iota-sdk/transactions";
+import { SharedObjectRef } from "@iota/iota.js/dist/cjs/bcs/types";
+import { ObjectRef, Transaction, TransactionArgument } from "@iota/iota.js/transactions";
 import { getControllerDelegation, putBackDelegationToken } from "../utils";
 
 export function proposeControllerExecution(

diff --git a/bindings/wasm/iota_interaction_ts/lib/move_calls/identity/create.ts b/bindings/wasm/iota_interaction_ts/lib/move_calls/identity/create.ts
@@ -1,7 +1,7 @@
 // Copyright 2020-2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { Transaction } from "@iota/iota-sdk/transactions";
+import { Transaction } from "@iota/iota.js/transactions";
 import { getClockRef } from "../utils";
 
 export function create(didDoc: Uint8Array, packageId: string): Promise<Uint8Array> {

diff --git a/bindings/wasm/iota_interaction_ts/lib/move_calls/identity/deactivate.ts b/bindings/wasm/iota_interaction_ts/lib/move_calls/identity/deactivate.ts
@@ -1,8 +1,8 @@
 // Copyright 2020-2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { SharedObjectRef } from "@iota/iota-sdk/dist/cjs/bcs/types";
-import { ObjectRef, Transaction } from "@iota/iota-sdk/transactions";
+import { SharedObjectRef } from "@iota/iota.js/dist/cjs/bcs/types";
+import { ObjectRef, Transaction } from "@iota/iota.js/transactions";
 import { getClockRef, getControllerDelegation, putBackDelegationToken } from "../utils";
 
 export function proposeDeactivation(

diff --git a/bindings/wasm/iota_interaction_ts/lib/move_calls/identity/proposal.ts b/bindings/wasm/iota_interaction_ts/lib/move_calls/identity/proposal.ts
@@ -1,8 +1,8 @@
 // Copyright 2020-2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { SharedObjectRef } from "@iota/iota-sdk/dist/cjs/bcs/types";
-import { ObjectRef, Transaction } from "@iota/iota-sdk/transactions";
+import { SharedObjectRef } from "@iota/iota.js/dist/cjs/bcs/types";
+import { ObjectRef, Transaction } from "@iota/iota.js/transactions";
 import { getControllerDelegation, putBackDelegationToken } from "../utils";
 
 export function approve(

diff --git a/bindings/wasm/iota_interaction_ts/lib/move_calls/identity/send_asset.ts b/bindings/wasm/iota_interaction_ts/lib/move_calls/identity/send_asset.ts
@@ -1,8 +1,8 @@
 // Copyright 2020-2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { SharedObjectRef } from "@iota/iota-sdk/dist/cjs/bcs/types";
-import { ObjectRef, Transaction } from "@iota/iota-sdk/transactions";
+import { SharedObjectRef } from "@iota/iota.js/dist/cjs/bcs/types";
+import { ObjectRef, Transaction } from "@iota/iota.js/transactions";
 import { getControllerDelegation, putBackDelegationToken } from "../utils";
 
 export function proposeSend(

diff --git a/bindings/wasm/iota_interaction_ts/lib/move_calls/identity/update.ts b/bindings/wasm/iota_interaction_ts/lib/move_calls/identity/update.ts
@@ -1,8 +1,8 @@
 // Copyright 2020-2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { SharedObjectRef } from "@iota/iota-sdk/dist/cjs/bcs/types";
-import { ObjectRef, Transaction } from "@iota/iota-sdk/transactions";
+import { SharedObjectRef } from "@iota/iota.js/dist/cjs/bcs/types";
+import { ObjectRef, Transaction } from "@iota/iota.js/transactions";
 import { getClockRef, getControllerDelegation, putBackDelegationToken } from "../utils";
 
 export function proposeUpdate(

diff --git a/bindings/wasm/iota_interaction_ts/lib/move_calls/identity/upgrade.ts b/bindings/wasm/iota_interaction_ts/lib/move_calls/identity/upgrade.ts
@@ -1,8 +1,8 @@
 // Copyright 2020-2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { SharedObjectRef } from "@iota/iota-sdk/dist/cjs/bcs/types";
-import { ObjectRef, Transaction } from "@iota/iota-sdk/transactions";
+import { SharedObjectRef } from "@iota/iota.js/dist/cjs/bcs/types";
+import { ObjectRef, Transaction } from "@iota/iota.js/transactions";
 
 export function proposeUpgrade(
     identity: SharedObjectRef,

diff --git a/bindings/wasm/iota_interaction_ts/lib/move_calls/migration.ts b/bindings/wasm/iota_interaction_ts/lib/move_calls/migration.ts
@@ -1,8 +1,8 @@
 // Copyright 2020-2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { SharedObjectRef } from "@iota/iota-sdk/dist/cjs/bcs/types";
-import { ObjectRef, Transaction } from "@iota/iota-sdk/transactions";
+import { SharedObjectRef } from "@iota/iota.js/dist/cjs/bcs/types";
+import { ObjectRef, Transaction } from "@iota/iota.js/transactions";
 import { getClockRef } from "./utils";
 
 export function migrateDidOutput(

diff --git a/bindings/wasm/iota_interaction_ts/lib/move_calls/utils.ts b/bindings/wasm/iota_interaction_ts/lib/move_calls/utils.ts
@@ -1,5 +1,5 @@
-import { Transaction, TransactionArgument, TransactionResult } from "@iota/iota-sdk/transactions";
-import { IOTA_CLOCK_OBJECT_ID } from "@iota/iota-sdk/utils";
+import { Transaction, TransactionArgument, TransactionResult } from "@iota/iota.js/transactions";
+import { IOTA_CLOCK_OBJECT_ID } from "@iota/iota.js/utils";
 
 export function getClockRef(tx: Transaction): TransactionArgument {
     return tx.sharedObjectRef({ objectId: IOTA_CLOCK_OBJECT_ID, initialSharedVersion: 1, mutable: false });

diff --git a/bindings/wasm/iota_interaction_ts/package-lock.json b/bindings/wasm/iota_interaction_ts/package-lock.json
diff --git a/bindings/wasm/iota_interaction_ts/package.json b/bindings/wasm/iota_interaction_ts/package.json
@@ -74,7 +74,6 @@
   },
   "dependencies": {
     "@iota/iota.js": "file:../../../../iota/sdk/typescript",
-    "@iota/iota-sdk": "^0.4.0",
     "@noble/ed25519": "^1.7.3",
     "@noble/hashes": "^1.4.0",
     "@types/node-fetch": "^2.6.2",

diff --git a/bindings/wasm/iota_interaction_ts/src/identity_move_calls.rs b/bindings/wasm/iota_interaction_ts/src/identity_move_calls.rs
@@ -21,6 +21,8 @@ use identity_iota_interaction::rpc_types::OwnedObjectRef;
 use identity_iota_interaction::types::base_types::IotaAddress;
 use identity_iota_interaction::types::base_types::ObjectID;
 use identity_iota_interaction::types::base_types::ObjectRef;
+use identity_iota_interaction::types::base_types::SequenceNumber;
+use identity_iota_interaction::types::transaction::Argument;
 use identity_iota_interaction::types::TypeTag;
 use identity_iota_interaction::BorrowIntentFnInternalT;
 use identity_iota_interaction::ControllerIntentFnInternalT;

diff --git a/bindings/wasm/iota_interaction_ts/src/migration_move_calls.rs b/bindings/wasm/iota_interaction_ts/src/migration_move_calls.rs
@@ -5,6 +5,8 @@ use identity_iota_interaction::ident_str;
 use identity_iota_interaction::rpc_types::OwnedObjectRef;
 use identity_iota_interaction::types::base_types::ObjectID;
 use identity_iota_interaction::types::base_types::ObjectRef;
+use identity_iota_interaction::types::transaction::ObjectArg;
+use identity_iota_interaction::types::IOTA_FRAMEWORK_PACKAGE_ID;
 use identity_iota_interaction::MigrationMoveCalls;
 use identity_iota_interaction::ProgrammableTransactionBcs;
 use js_sys::Uint8Array;

diff --git a/identity_iota_core/src/rebased/proposals/borrow.rs b/identity_iota_core/src/rebased/proposals/borrow.rs
@@ -37,7 +37,7 @@ use super::UserDrivenTx;
 
 cfg_if::cfg_if! {
     if #[cfg(target_arch = "wasm32")] {
-      use iota_interaction_ts::NativeTsTransactionBuilderBindingWrapper as Ptb;
+      use iota_interaction_ts::NativeTsCodeBindingWrapper as Ptb;
       use iota_interaction_ts::error::TsSdkError as IotaInteractionError;
       /// Instances of BorrowIntentFnT can be used as user-provided function to describe how
       /// a borrowed assets shall be used.

diff --git a/identity_iota_core/src/rebased/proposals/controller.rs b/identity_iota_core/src/rebased/proposals/controller.rs
@@ -38,7 +38,7 @@ use super::UserDrivenTx;
 
 cfg_if::cfg_if! {
     if #[cfg(target_arch = "wasm32")] {
-      use iota_interaction_ts::NativeTsTransactionBuilderBindingWrapper as Ptb;
+      use iota_interaction_ts::NativeTsCodeBindingWrapper as Ptb;
       /// Instances of ControllerIntentFnT can be used as user-provided function to describe how
       /// a borrowed identity's controller capability will be used.
       pub trait ControllerIntentFnT: FnOnce(&mut Ptb, &Argument) {}