@onekeyfe/onekey-aptos-provider 2.2.25 → 2.2.26

package/dist/OnekeyAptosProvider.d.ts

@@ -1,6 +1,6 @@
 import { IInpageProviderConfig } from '@onekeyfe/cross-inpage-provider-core';
 import { ProviderAptosBase } from './ProviderAptosBase';
-import type { AptosAccountInfo, ProviderState, SignMessagePayload, SignMessagePayloadCompatible, SignMessageResponse, SignMessageResponseCompatible } from './types';
+import { AptosAccountInfo, ProviderState, SignMessagePayload, SignMessagePayloadCompatible, SignMessageResponse, SignMessageResponseCompatible } from './types';
 import { IJsonRpcRequest } from '@onekeyfe/cross-inpage-provider-types';
 import type { Types } from 'aptos';
 import type { AccountAuthenticator, PendingTransactionResponse } from '@aptos-labs/ts-sdk';

package/dist/StandardProvider.js

@@ -9,7 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { Ed25519Signature, Ed25519PublicKey, Network, AccountAddress, Serializer, } from '@aptos-labs/ts-sdk';
 import { APTOS_CHAINS, AccountInfo, registerWallet, UserResponseStatus, } from '@aptos-labs/wallet-standard';
-import { stripHexPrefix, bytesToHex } from '@onekeyfe/cross-inpage-provider-core';
+import { bytesToHex } from '@noble/hashes/utils';
+import { stripHexPrefix } from './utils';
 export class WalletAccount {
     constructor(account) {
         this.chains = APTOS_CHAINS;

package/dist/__tests__/fixtures/payloadSerializer.test.js

@@ -4,7 +4,7 @@ global.TextEncoder = TextEncoder;
 global.TextDecoder = TextDecoder;
 import { Bool, U8, U16, U32, U64, U128, U256, AccountAddress, MoveVector, MoveOption, MoveString, } from '@aptos-labs/ts-sdk';
 import { serializeTransactionPayload, deserializeTransactionPayload } from '../../serializer';
-import { hexToBytes } from '@onekeyfe/cross-inpage-provider-core';
+import { hexToBytes } from '@noble/hashes/utils';
 import { TxnBuilderTypes } from 'aptos';
 import { get } from 'lodash';
 describe('TransactionPayloadSerializer', () => {

package/dist/__tests__/fixtures/serializer.test.js

@@ -4,7 +4,7 @@ global.TextEncoder = TextEncoder;
 global.TextDecoder = TextDecoder;
 import { Bool, U8, U16, U32, U64, U128, U256, AccountAddress, MoveVector, MoveOption, MoveString, FixedBytes, } from '@aptos-labs/ts-sdk';
 import { serializeArguments, deserializeArguments } from '../../serializer';
-import { hexToBytes } from '@onekeyfe/cross-inpage-provider-core';
+import { hexToBytes } from '@noble/hashes/utils';
 function deepCompare(input, output) {
     if (input instanceof MoveVector && output instanceof MoveVector) {
         if (input.values.length !== output.values.length) {

package/dist/cjs/StandardProvider.js

@@ -13,7 +13,8 @@ exports.AptosStandardProvider = exports.WalletAccount = void 0;
 exports.registerAptosWallet = registerAptosWallet;
 const ts_sdk_1 = require("@aptos-labs/ts-sdk");
 const wallet_standard_1 = require("@aptos-labs/wallet-standard");
-const cross_inpage_provider_core_1 = require("@onekeyfe/cross-inpage-provider-core");
+const utils_1 = require("@noble/hashes/utils");
+const utils_2 = require("./utils");
 class WalletAccount {
     constructor(account) {
         this.chains = wallet_standard_1.APTOS_CHAINS;
@@ -115,7 +116,7 @@ class AptosStandardProvider {
                 const serializer = new ts_sdk_1.Serializer();
                 input.serialize(serializer);
                 const payload = serializer.toUint8Array();
-                const result = yield this.provider.signAndSubmitTransactionStandardV1((0, cross_inpage_provider_core_1.bytesToHex)(payload));
+                const result = yield this.provider.signAndSubmitTransactionStandardV1((0, utils_1.bytesToHex)(payload));
                 return {
                     status: wallet_standard_1.UserResponseStatus.APPROVED,
                     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
@@ -162,7 +163,7 @@ class AptosStandardProvider {
         this.onAccountChange = (input) => __awaiter(this, void 0, void 0, function* () {
             this.provider.onAccountChangeStandardV2((account) => {
                 var _a, _b;
-                const address = (0, cross_inpage_provider_core_1.stripHexPrefix)((_a = account === null || account === void 0 ? void 0 : account.address) !== null && _a !== void 0 ? _a : '');
+                const address = (0, utils_2.stripHexPrefix)((_a = account === null || account === void 0 ? void 0 : account.address) !== null && _a !== void 0 ? _a : '');
                 if (account && address.length === 64) {
                     input(new wallet_standard_1.AccountInfo({
                         address: new ts_sdk_1.AccountAddress(Buffer.from(address, 'hex')),

package/dist/cjs/__tests__/fixtures/payloadSerializer.test.js

@@ -6,7 +6,7 @@ global.TextEncoder = util_1.TextEncoder;
 global.TextDecoder = util_1.TextDecoder;
 const ts_sdk_1 = require("@aptos-labs/ts-sdk");
 const serializer_1 = require("../../serializer");
-const cross_inpage_provider_core_1 = require("@onekeyfe/cross-inpage-provider-core");
+const utils_1 = require("@noble/hashes/utils");
 const aptos_1 = require("aptos");
 const lodash_1 = require("lodash");
 describe('TransactionPayloadSerializer', () => {
@@ -39,13 +39,13 @@ describe('TransactionPayloadSerializer', () => {
         }
     });
     it('serialize v1 wormhole payload', () => {
-        const script = new aptos_1.TxnBuilderTypes.Script((0, cross_inpage_provider_core_1.hexToBytes)('0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20'), [], [
+        const script = new aptos_1.TxnBuilderTypes.Script((0, utils_1.hexToBytes)('0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20'), [], [
             new aptos_1.TxnBuilderTypes.TransactionArgumentU8(1),
             new aptos_1.TxnBuilderTypes.TransactionArgumentU64(BigInt('18446744073709551615')),
             new aptos_1.TxnBuilderTypes.TransactionArgumentU128(BigInt('340282366920938463463374607431768211455')),
             new aptos_1.TxnBuilderTypes.TransactionArgumentBool(true),
-            new aptos_1.TxnBuilderTypes.TransactionArgumentAddress(new aptos_1.TxnBuilderTypes.AccountAddress((0, cross_inpage_provider_core_1.hexToBytes)('1'.repeat(64)))),
-            new aptos_1.TxnBuilderTypes.TransactionArgumentU8Vector((0, cross_inpage_provider_core_1.hexToBytes)('0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20')),
+            new aptos_1.TxnBuilderTypes.TransactionArgumentAddress(new aptos_1.TxnBuilderTypes.AccountAddress((0, utils_1.hexToBytes)('1'.repeat(64)))),
+            new aptos_1.TxnBuilderTypes.TransactionArgumentU8Vector((0, utils_1.hexToBytes)('0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20')),
         ]);
         const payload = new aptos_1.TxnBuilderTypes.TransactionPayloadScript(script);
         // @ts-expect-error

package/dist/cjs/__tests__/fixtures/serializer.test.js

@@ -6,7 +6,7 @@ global.TextEncoder = util_1.TextEncoder;
 global.TextDecoder = util_1.TextDecoder;
 const ts_sdk_1 = require("@aptos-labs/ts-sdk");
 const serializer_1 = require("../../serializer");
-const cross_inpage_provider_core_1 = require("@onekeyfe/cross-inpage-provider-core");
+const utils_1 = require("@noble/hashes/utils");
 function deepCompare(input, output) {
     if (input instanceof ts_sdk_1.MoveVector && output instanceof ts_sdk_1.MoveVector) {
         if (input.values.length !== output.values.length) {
@@ -79,9 +79,9 @@ describe('Serializer', () => {
                 new ts_sdk_1.U64(BigInt('18446744073709551615')),
                 new ts_sdk_1.U128(BigInt('340282366920938463463374607431768211455')),
                 new ts_sdk_1.U256(BigInt('0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff')),
-                new ts_sdk_1.AccountAddress((0, cross_inpage_provider_core_1.hexToBytes)('1'.repeat(64))),
+                new ts_sdk_1.AccountAddress((0, utils_1.hexToBytes)('1'.repeat(64))),
                 new ts_sdk_1.MoveString('SDK'),
-                new ts_sdk_1.FixedBytes((0, cross_inpage_provider_core_1.hexToBytes)('010203')),
+                new ts_sdk_1.FixedBytes((0, utils_1.hexToBytes)('010203')),
             ];
             const serialized = (0, serializer_1.serializeArguments)(inputs);
             const deserialized = (0, serializer_1.deserializeArguments)(serialized);
@@ -92,8 +92,8 @@ describe('Serializer', () => {
                 new ts_sdk_1.MoveVector([new ts_sdk_1.U8(1), new ts_sdk_1.U8(2), new ts_sdk_1.U8(3)]),
                 new ts_sdk_1.MoveVector([new ts_sdk_1.Bool(true), new ts_sdk_1.Bool(false)]),
                 new ts_sdk_1.MoveVector([
-                    new ts_sdk_1.AccountAddress((0, cross_inpage_provider_core_1.hexToBytes)('1'.repeat(64))),
-                    new ts_sdk_1.AccountAddress((0, cross_inpage_provider_core_1.hexToBytes)('2'.repeat(64))),
+                    new ts_sdk_1.AccountAddress((0, utils_1.hexToBytes)('1'.repeat(64))),
+                    new ts_sdk_1.AccountAddress((0, utils_1.hexToBytes)('2'.repeat(64))),
                 ]),
                 new ts_sdk_1.MoveVector([
                     new ts_sdk_1.MoveString('SDK'),
@@ -170,7 +170,7 @@ describe('Serializer', () => {
                 new ts_sdk_1.MoveString('hello'),
                 [1, 2, new ts_sdk_1.U8(3)],
                 new ts_sdk_1.MoveVector([new ts_sdk_1.U8(1), new ts_sdk_1.U8(2)]),
-                new ts_sdk_1.MoveOption(new ts_sdk_1.FixedBytes((0, cross_inpage_provider_core_1.hexToBytes)('010203'))),
+                new ts_sdk_1.MoveOption(new ts_sdk_1.FixedBytes((0, utils_1.hexToBytes)('010203'))),
                 [
                     new ts_sdk_1.MoveOption(new ts_sdk_1.U64(BigInt(42))),
                     new ts_sdk_1.MoveVector([new ts_sdk_1.Bool(true), new ts_sdk_1.Bool(false)]),
@@ -201,7 +201,7 @@ describe('Serializer', () => {
             expect(deserialized[6].isSome()).toBe(true);
             const fixedBytes = deserialized[6].value;
             expect(fixedBytes).toBeInstanceOf(ts_sdk_1.FixedBytes);
-            expect(fixedBytes === null || fixedBytes === void 0 ? void 0 : fixedBytes.toString()).toEqual(new ts_sdk_1.FixedBytes((0, cross_inpage_provider_core_1.hexToBytes)('010203')).toString());
+            expect(fixedBytes === null || fixedBytes === void 0 ? void 0 : fixedBytes.toString()).toEqual(new ts_sdk_1.FixedBytes((0, utils_1.hexToBytes)('010203')).toString());
             // 验证复杂嵌套结构
             const complexArray = deserialized[7];
             expect(complexArray[0]).toBeInstanceOf(ts_sdk_1.MoveOption);
@@ -229,7 +229,7 @@ describe('Serializer', () => {
                     new ts_sdk_1.MoveOption(),
                 ]),
                 [
-                    new ts_sdk_1.AccountAddress((0, cross_inpage_provider_core_1.hexToBytes)('1'.repeat(64))),
+                    new ts_sdk_1.AccountAddress((0, utils_1.hexToBytes)('1'.repeat(64))),
                     123,
                     new ts_sdk_1.MoveVector([new ts_sdk_1.Bool(true), new ts_sdk_1.Bool(false)]),
                     [new ts_sdk_1.MoveOption(new ts_sdk_1.MoveVector([new ts_sdk_1.U8(1), new ts_sdk_1.U8(2)])), 'nested string', BigInt(456)],

package/dist/cjs/serializer.js

@@ -8,7 +8,7 @@ exports.deserializeArgument = deserializeArgument;
 exports.deserializeArguments = deserializeArguments;
 exports.serializeArguments = serializeArguments;
 const ts_sdk_1 = require("@aptos-labs/ts-sdk");
-const cross_inpage_provider_core_1 = require("@onekeyfe/cross-inpage-provider-core");
+const utils_1 = require("@noble/hashes/utils");
 var TransactionPayloadType;
 (function (TransactionPayloadType) {
     TransactionPayloadType[TransactionPayloadType["SCRIPT"] = 0] = "SCRIPT";
@@ -83,10 +83,10 @@ function serializeTransactionPayload(args) {
     else {
         throw new Error('Invalid transaction payload type');
     }
-    return (0, cross_inpage_provider_core_1.bytesToHex)(serializer.toUint8Array());
+    return (0, utils_1.bytesToHex)(serializer.toUint8Array());
 }
 function deserializeTransactionPayload(hex) {
-    const deserializer = new ts_sdk_1.Deserializer((0, cross_inpage_provider_core_1.hexToBytes)(hex));
+    const deserializer = new ts_sdk_1.Deserializer((0, utils_1.hexToBytes)(hex));
     const type = deserializer.deserializeUleb128AsU32();
     if (type === TransactionPayloadType.ENTRY_FUNCTION) {
         return deserializeTransactionPayloadEntryFunction(deserializer);
@@ -303,7 +303,7 @@ function deserializeArgument(deserializer) {
     }
 }
 function deserializeArguments(bytes) {
-    const deserializer = new ts_sdk_1.Deserializer((0, cross_inpage_provider_core_1.hexToBytes)(bytes));
+    const deserializer = new ts_sdk_1.Deserializer((0, utils_1.hexToBytes)(bytes));
     const length = deserializer.deserializeU32();
     const args = [];
     for (let i = 0; i < length; i++) {
@@ -315,12 +315,12 @@ function serializeArguments(args) {
     const serializer = new ts_sdk_1.Serializer();
     serializer.serializeU32(args.length);
     args.forEach((arg) => serializeArgument(serializer, arg));
-    return (0, cross_inpage_provider_core_1.bytesToHex)(serializer.toUint8Array());
+    return (0, utils_1.bytesToHex)(serializer.toUint8Array());
 }
 function serializeTransactionPayloadScript(args, serializer) {
     const { bytecode, typeArguments, functionArguments } = args;
     serializer.serializeU32AsUleb128(TransactionPayloadType.SCRIPT);
-    const bytecodeBytes = typeof bytecode === 'string' ? bytecode : (0, cross_inpage_provider_core_1.bytesToHex)(bytecode);
+    const bytecodeBytes = typeof bytecode === 'string' ? bytecode : (0, utils_1.bytesToHex)(bytecode);
     serializer.serializeOption(bytecodeBytes);
     serializer.serializeVector((0, ts_sdk_1.standardizeTypeTags)(typeArguments));
     const hex = serializeArguments(functionArguments);

package/dist/cjs/utils.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasHexPrefix = hasHexPrefix;
+exports.stripHexPrefix = stripHexPrefix;
+function hasHexPrefix(data) {
+    return data.startsWith('0x');
+}
+function stripHexPrefix(hex) {
+    return hasHexPrefix(hex) ? hex.slice(2) : hex;
+}

package/dist/serializer.js

@@ -1,5 +1,5 @@
 import { Serializer, Deserializer, MoveVector, MoveOption, U8, U64, U128, AccountAddress, Bool, U16, U32, U256, Serialized, MoveString, FixedBytes, TypeTag, standardizeTypeTags, } from '@aptos-labs/ts-sdk';
-import { hexToBytes, bytesToHex } from '@onekeyfe/cross-inpage-provider-core';
+import { hexToBytes, bytesToHex } from '@noble/hashes/utils';
 export var TransactionPayloadType;
 (function (TransactionPayloadType) {
     TransactionPayloadType[TransactionPayloadType["SCRIPT"] = 0] = "SCRIPT";

package/dist/utils.d.ts

@@ -0,0 +1,2 @@
+export declare function hasHexPrefix(data: string): boolean;
+export declare function stripHexPrefix(hex: string): string;

package/dist/utils.js

@@ -0,0 +1,6 @@
+export function hasHexPrefix(data) {
+    return data.startsWith('0x');
+}
+export function stripHexPrefix(hex) {
+    return hasHexPrefix(hex) ? hex.slice(2) : hex;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-aptos-provider",
-  "version": "2.2.25",
+  "version": "2.2.26",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -29,10 +29,10 @@
   },
   "dependencies": {
     "@aptos-labs/wallet-standard": "^0.2.0",
-    "@onekeyfe/cross-inpage-provider-core": "2.2.25",
-    "@onekeyfe/cross-inpage-provider-errors": "2.2.25",
-    "@onekeyfe/cross-inpage-provider-types": "2.2.25",
-    "@onekeyfe/extension-bridge-injected": "2.2.25",
+    "@onekeyfe/cross-inpage-provider-core": "2.2.26",
+    "@onekeyfe/cross-inpage-provider-errors": "2.2.26",
+    "@onekeyfe/cross-inpage-provider-types": "2.2.26",
+    "@onekeyfe/extension-bridge-injected": "2.2.26",
     "@wallet-standard/core": "1.0.3",
     "eth-rpc-errors": "^4.0.3"
   },
@@ -43,5 +43,5 @@
     "@aptos-labs/ts-sdk": "^1.30.0",
     "aptos": "^1.3.17"
   },
-  "gitHead": "b03afba95cb83e01062a2da65cdfdfb11a7a4dd1"
+  "gitHead": "bbf6e9bae844ea2d5aaed884a4ace9cc8051569d"
 }