@zhoujun_aptos/octopus-ts-sdk-min 0.22.8 → 0.24.0

package/dist/esm/index.d.mts

@@ -1,6 +1,5 @@
 import * as AptosSDK from '@aptos-labs/ts-sdk';
 import { Deserializer, Serializer, Aptos, AccountAddress, Ed25519PublicKey, Ed25519Signature, AccountPublicKey, Signature as Signature$1, PublicKey as PublicKey$1, AptosConfig } from '@aptos-labs/ts-sdk';
-import * as SolanaSDK from '@solana/web3.js';
 import { PublicKey, Transaction, VersionedTransaction } from '@solana/web3.js';
 
 declare class Element {
@@ -768,7 +767,7 @@ declare class ContractID$1 {
     programId: PublicKey;
     constructor({ knownChainName, programId }: {
         knownChainName: string;
-        programId: PublicKey;
+        programId: string;
     });
     static deserialize(deserializer: Deserializer): ContractID$1;
     static fromBytes(bytes: Uint8Array): ContractID$1;
@@ -826,7 +825,7 @@ declare class ContractID {
     }): ContractID;
     static newSolana({ knownChainName, programId }: {
         knownChainName: string;
-        programId: SolanaSDK.PublicKey;
+        programId: string;
     }): ContractID;
     static dummy(): ContractID;
     static deserialize(deserializer: Deserializer): ContractID;
@@ -905,7 +904,7 @@ declare class ProofOfPermission {
         fullMessage: string;
     }): ProofOfPermission;
     static createSolana({ txn }: {
-        txn: SolanaSDK.Transaction | SolanaSDK.VersionedTransaction;
+        txn: Uint8Array;
     }): ProofOfPermission;
     static deserialize(deserializer: Deserializer): ProofOfPermission;
     static fromBytes(bytes: Uint8Array): ProofOfPermission;

package/dist/esm/index.mjs

@@ -2651,7 +2651,6 @@ __export(threshold_ibe_exports, {
 });
 import { Deserializer as Deserializer13, Serializer as Serializer14 } from "@aptos-labs/ts-sdk";
 import { bytesToHex as bytesToHex13, hexToBytes as hexToBytes8 } from "@noble/hashes/utils";
-import * as SolanaSDK from "@solana/web3.js";
 
 // src/threshold-ibe/aptos.ts
 import { AccountAddress as AccountAddress2, AccountPublicKey, AnyPublicKey, AnySignature, Aptos as Aptos2, AptosConfig as AptosConfig2, Deserializer as Deserializer11, Ed25519PublicKey, Ed25519Signature, FederatedKeylessPublicKey, KeylessPublicKey, KeylessSignature, MultiEd25519PublicKey, MultiEd25519Signature, MultiKey, MultiKeySignature, Network as Network3, Serializer as Serializer12 } from "@aptos-labs/ts-sdk";
@@ -2969,12 +2968,12 @@ var ContractID2 = class _ContractID {
   programId;
   constructor({ knownChainName, programId }) {
     this.knownChainName = knownChainName;
-    this.programId = programId;
+    this.programId = new PublicKey2(programId);
   }
   static deserialize(deserializer) {
     const knownChainName = deserializer.deserializeStr();
     const programId = new PublicKey2(deserializer.deserializeBytes());
-    return new _ContractID({ knownChainName, programId });
+    return new _ContractID({ knownChainName, programId: programId.toBase58() });
   }
   static fromBytes(bytes) {
     const deserializer = new Deserializer12(bytes);
@@ -3162,6 +3161,7 @@ async function assertTransactionSimulationPasses(txn, chainName) {
 }
 
 // src/threshold-ibe/index.ts
+import { Transaction as Transaction2, VersionedTransaction as VersionedTransaction2 } from "@solana/web3.js";
 var Committee = class _Committee {
   workerEndpoints;
   threshold;
@@ -3444,8 +3444,13 @@ var ProofOfPermission3 = class _ProofOfPermission {
     return new _ProofOfPermission(_ProofOfPermission.SCHEME_APTOS, new ProofOfPermission({ userAddr, publicKey, signature, fullMessage }));
   }
   static createSolana({ txn }) {
-    const solanaProof = txn instanceof SolanaSDK.VersionedTransaction ? ProofOfPermission2.newVersioned(txn) : ProofOfPermission2.newUnversioned(txn);
-    return new _ProofOfPermission(_ProofOfPermission.SCHEME_SOLANA, solanaProof);
+    try {
+      const versioned = VersionedTransaction2.deserialize(txn);
+      return new _ProofOfPermission(_ProofOfPermission.SCHEME_SOLANA, ProofOfPermission2.newVersioned(versioned));
+    } catch {
+      const legacy = Transaction2.from(Buffer.from(txn));
+      return new _ProofOfPermission(_ProofOfPermission.SCHEME_SOLANA, ProofOfPermission2.newUnversioned(legacy));
+    }
   }
   static deserialize(deserializer) {
     const scheme = deserializer.deserializeU8();
@@ -4109,7 +4114,7 @@ __export(solana_exports, {
 });
 import { Deserializer as Deserializer17, Serializer as Serializer18 } from "@aptos-labs/ts-sdk";
 import { bytesToHex as bytesToHex17, hexToBytes as hexToBytes12 } from "@noble/hashes/utils";
-import { PublicKey as PublicKey3, Transaction as Transaction2, VersionedTransaction as VersionedTransaction3 } from "@solana/web3.js";
+import { PublicKey as PublicKey3, Transaction as Transaction3, VersionedTransaction as VersionedTransaction3 } from "@solana/web3.js";
 var SCHEME_V0 = 0;
 var ContractID5 = class _ContractID {
   scheme;
@@ -4208,7 +4213,7 @@ var ProofOfPermission5 = class _ProofOfPermission {
       const inner = VersionedTransaction3.deserialize(bytes);
       return new _ProofOfPermission(POP_SCHEME__VERSIONED_TXN, inner);
     } else if (scheme == POP_SCHEME__UNVERSIONED_TXN) {
-      const inner = Transaction2.from(Buffer.from(bytes));
+      const inner = Transaction3.from(Buffer.from(bytes));
       return new _ProofOfPermission(POP_SCHEME__UNVERSIONED_TXN, inner);
     } else {
       throw new Error(`Unknown scheme: ${scheme}`);