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

package/dist/common/index.d.ts

@@ -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/common/index.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -2693,7 +2683,6 @@ __export(threshold_ibe_exports, {
 });
 var import_ts_sdk14 = require("@aptos-labs/ts-sdk");
 var import_utils19 = require("@noble/hashes/utils");
-var SolanaSDK = __toESM(require("@solana/web3.js"));
 
 // src/threshold-ibe/aptos.ts
 var import_ts_sdk12 = require("@aptos-labs/ts-sdk");
@@ -3011,12 +3000,12 @@ var ContractID2 = class _ContractID {
   programId;
   constructor({ knownChainName, programId }) {
     this.knownChainName = knownChainName;
-    this.programId = programId;
+    this.programId = new import_web3.PublicKey(programId);
   }
   static deserialize(deserializer) {
     const knownChainName = deserializer.deserializeStr();
     const programId = new import_web3.PublicKey(deserializer.deserializeBytes());
-    return new _ContractID({ knownChainName, programId });
+    return new _ContractID({ knownChainName, programId: programId.toBase58() });
   }
   static fromBytes(bytes) {
     const deserializer = new import_ts_sdk13.Deserializer(bytes);
@@ -3204,6 +3193,7 @@ async function assertTransactionSimulationPasses(txn, chainName) {
 }
 
 // src/threshold-ibe/index.ts
+var import_web32 = require("@solana/web3.js");
 var Committee = class _Committee {
   workerEndpoints;
   threshold;
@@ -3486,8 +3476,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 = import_web32.VersionedTransaction.deserialize(txn);
+      return new _ProofOfPermission(_ProofOfPermission.SCHEME_SOLANA, ProofOfPermission2.newVersioned(versioned));
+    } catch {
+      const legacy = import_web32.Transaction.from(Buffer.from(txn));
+      return new _ProofOfPermission(_ProofOfPermission.SCHEME_SOLANA, ProofOfPermission2.newUnversioned(legacy));
+    }
   }
   static deserialize(deserializer) {
     const scheme = deserializer.deserializeU8();
@@ -4151,7 +4146,7 @@ __export(solana_exports, {
 });
 var import_ts_sdk18 = require("@aptos-labs/ts-sdk");
 var import_utils23 = require("@noble/hashes/utils");
-var import_web32 = require("@solana/web3.js");
+var import_web33 = require("@solana/web3.js");
 var SCHEME_V0 = 0;
 var ContractID5 = class _ContractID {
   scheme;
@@ -4205,7 +4200,7 @@ var ContractIDV0 = class _ContractIDV0 {
   }
   static deserialize(deserializer) {
     const knownChainName = deserializer.deserializeStr();
-    const programId = new import_web32.PublicKey(deserializer.deserializeBytes());
+    const programId = new import_web33.PublicKey(deserializer.deserializeBytes());
     return new _ContractIDV0(knownChainName, programId);
   }
   static fromBytes(bytes) {
@@ -4247,10 +4242,10 @@ var ProofOfPermission5 = class _ProofOfPermission {
     const scheme = deserializer.deserializeU8();
     const bytes = deserializer.deserializeBytes();
     if (scheme == POP_SCHEME__VERSIONED_TXN) {
-      const inner = import_web32.VersionedTransaction.deserialize(bytes);
+      const inner = import_web33.VersionedTransaction.deserialize(bytes);
       return new _ProofOfPermission(POP_SCHEME__VERSIONED_TXN, inner);
     } else if (scheme == POP_SCHEME__UNVERSIONED_TXN) {
-      const inner = import_web32.Transaction.from(Buffer.from(bytes));
+      const inner = import_web33.Transaction.from(Buffer.from(bytes));
       return new _ProofOfPermission(POP_SCHEME__UNVERSIONED_TXN, inner);
     } else {
       throw new Error(`Unknown scheme: ${scheme}`);