@onekeyfe/onekey-aptos-provider 2.2.21 → 2.2.23

package/dist/OnekeyAptosProvider.d.ts

@@ -3,7 +3,7 @@ import { ProviderAptosBase } from './ProviderAptosBase';
 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 } from '@aptos-labs/ts-sdk';
+import type { AccountAuthenticator, PendingTransactionResponse } from '@aptos-labs/ts-sdk';
 import { AptosSignAndSubmitTransactionInput, AptosSignAndSubmitTransactionOutput } from '@aptos-labs/wallet-standard';
 export type AptosProviderType = 'petra' | 'martian';
 type SignTransactionV2Params = {
@@ -42,6 +42,7 @@ export type AptosRequest = {
         publicKey: string;
     }>;
     'signAndSubmitTransactionV2': (params: string) => Promise<AptosSignAndSubmitTransactionOutput>;
+    'signAndSubmitTransactionStandardV1': (params: string) => Promise<string>;
 };
 export type PROVIDER_EVENTS_STRINGS = keyof typeof PROVIDER_EVENTS;
 export interface IProviderAptos extends ProviderAptosBase {
@@ -68,6 +69,7 @@ export interface IProviderAptos extends ProviderAptosBase {
     signTransaction(transactions: any): Promise<any>;
     signTransactionV2(params: SignTransactionV2Params): Promise<AccountAuthenticator>;
     signAndSubmitTransactionV2(params: AptosSignAndSubmitTransactionInput): Promise<AptosSignAndSubmitTransactionOutput>;
+    signAndSubmitTransactionStandardV1(params: string): Promise<PendingTransactionResponse>;
     /**
      * Sign message
      * @returns Transaction
@@ -103,6 +105,7 @@ declare class ProviderAptos extends ProviderAptosBase implements IProviderAptos
     signTransaction(transactions: Types.TransactionPayload): Promise<any>;
     signTransactionV2(params: SignTransactionV2Params): Promise<AccountAuthenticator>;
     signAndSubmitTransactionV2(params: AptosSignAndSubmitTransactionInput): Promise<AptosSignAndSubmitTransactionOutput>;
+    signAndSubmitTransactionStandardV1(params: string): Promise<PendingTransactionResponse>;
     signMessageCompatible(payload: SignMessagePayloadCompatible): Promise<SignMessageResponseCompatible>;
     signMessage(payload: SignMessagePayload): Promise<SignMessageResponse>;
     network(): Promise<string>;

package/dist/OnekeyAptosProvider.js

@@ -203,6 +203,18 @@ class ProviderAptos extends ProviderAptosBase {
             });
         });
     }
+    signAndSubmitTransactionStandardV1(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield this._callBridge({
+                method: 'signAndSubmitTransactionStandardV1',
+                params,
+            });
+            if (!res)
+                throw web3Errors.provider.unauthorized();
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+            return JSON.parse(res);
+        });
+    }
     signMessageCompatible(payload) {
         return __awaiter(this, void 0, void 0, function* () {
             return this._callBridge({

package/dist/StandardProvider.js

@@ -7,8 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { Ed25519Signature, Ed25519PublicKey, Network, AccountAddress } from '@aptos-labs/ts-sdk';
+import { Ed25519Signature, Ed25519PublicKey, Network, AccountAddress, Serializer, } from '@aptos-labs/ts-sdk';
 import { APTOS_CHAINS, AccountInfo, registerWallet, UserResponseStatus, } from '@aptos-labs/wallet-standard';
+import { bytesToHex } from '@noble/hashes/utils';
 import { stripHexPrefix } from './utils';
 export class WalletAccount {
     constructor(account) {
@@ -105,6 +106,18 @@ export class AptosStandardProvider {
             });
         });
         this.signAndSubmitTransaction = (input) => __awaiter(this, void 0, void 0, function* () {
+            if (!!input && 'rawTransaction' in input) {
+                // Support standard sign and send transaction 1.0.0
+                const serializer = new Serializer();
+                input.serialize(serializer);
+                const payload = serializer.toUint8Array();
+                const result = yield this.provider.signAndSubmitTransactionStandardV1(bytesToHex(payload));
+                return {
+                    status: UserResponseStatus.APPROVED,
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+                    args: result,
+                };
+            }
             const result = yield this.provider.signAndSubmitTransactionV2(input);
             return Promise.resolve({
                 status: UserResponseStatus.APPROVED,

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

@@ -91,4 +91,25 @@ describe('TransactionPayloadSerializer', () => {
             }
         }
     });
+    it('serialize v2 payload', () => {
+        const payload = {
+            function: '0xe52923154e25c258d9befb0237a30b4001c63dc3bb73011c29cb3739befffcef::router_v2dot1::swap_exact_input',
+            typeArguments: [
+                '0x1::aptos_coin::AptosCoin',
+                '0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDC',
+            ],
+            functionArguments: ['2272000', '61199'],
+        };
+        const serialized = serializeTransactionPayload(payload);
+        const deserialized = deserializeTransactionPayload(serialized);
+        expect(get(deserialized, 'function')).toEqual(payload.function);
+        const sourceArgs = payload.functionArguments;
+        const deserializedArgs = deserialized.functionArguments;
+        expect(deserializedArgs.length).toEqual(sourceArgs.length);
+        for (let i = 0; i < sourceArgs.length; i++) {
+            const currentSourceArg = sourceArgs[i];
+            const currentDeserializedArg = deserializedArgs[i];
+            expect(currentDeserializedArg).toEqual(currentSourceArg);
+        }
+    });
 });

package/dist/cjs/OnekeyAptosProvider.js

@@ -206,6 +206,18 @@ class ProviderAptos extends ProviderAptosBase_1.ProviderAptosBase {
             });
         });
     }
+    signAndSubmitTransactionStandardV1(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield this._callBridge({
+                method: 'signAndSubmitTransactionStandardV1',
+                params,
+            });
+            if (!res)
+                throw cross_inpage_provider_errors_1.web3Errors.provider.unauthorized();
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+            return JSON.parse(res);
+        });
+    }
     signMessageCompatible(payload) {
         return __awaiter(this, void 0, void 0, function* () {
             return this._callBridge({

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 utils_1 = require("./utils");
+const utils_1 = require("@noble/hashes/utils");
+const utils_2 = require("./utils");
 class WalletAccount {
     constructor(account) {
         this.chains = wallet_standard_1.APTOS_CHAINS;
@@ -110,6 +111,18 @@ class AptosStandardProvider {
             });
         });
         this.signAndSubmitTransaction = (input) => __awaiter(this, void 0, void 0, function* () {
+            if (!!input && 'rawTransaction' in input) {
+                // Support standard sign and send transaction 1.0.0
+                const serializer = new ts_sdk_1.Serializer();
+                input.serialize(serializer);
+                const payload = serializer.toUint8Array();
+                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
+                    args: result,
+                };
+            }
             const result = yield this.provider.signAndSubmitTransactionV2(input);
             return Promise.resolve({
                 status: wallet_standard_1.UserResponseStatus.APPROVED,
@@ -150,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, utils_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

@@ -93,4 +93,25 @@ describe('TransactionPayloadSerializer', () => {
             }
         }
     });
+    it('serialize v2 payload', () => {
+        const payload = {
+            function: '0xe52923154e25c258d9befb0237a30b4001c63dc3bb73011c29cb3739befffcef::router_v2dot1::swap_exact_input',
+            typeArguments: [
+                '0x1::aptos_coin::AptosCoin',
+                '0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDC',
+            ],
+            functionArguments: ['2272000', '61199'],
+        };
+        const serialized = (0, serializer_1.serializeTransactionPayload)(payload);
+        const deserialized = (0, serializer_1.deserializeTransactionPayload)(serialized);
+        expect((0, lodash_1.get)(deserialized, 'function')).toEqual(payload.function);
+        const sourceArgs = payload.functionArguments;
+        const deserializedArgs = deserialized.functionArguments;
+        expect(deserializedArgs.length).toEqual(sourceArgs.length);
+        for (let i = 0; i < sourceArgs.length; i++) {
+            const currentSourceArg = sourceArgs[i];
+            const currentDeserializedArg = deserializedArgs[i];
+            expect(currentDeserializedArg).toEqual(currentSourceArg);
+        }
+    });
 });

package/dist/cjs/serializer.js

@@ -52,6 +52,9 @@ var ScriptArgumentType;
     ScriptArgumentType[ScriptArgumentType["Serialized"] = 9] = "Serialized";
 })(ScriptArgumentType || (exports.ScriptArgumentType = ScriptArgumentType = {}));
 function serializeTransactionPayload(args) {
+    if (!args) {
+        throw new Error('Transaction payload cannot be undefined');
+    }
     const serializer = new ts_sdk_1.Serializer();
     if ('type' in args || ('arguments' in args && 'type_arguments' in args)) {
         // Some Dapps do not pass the type parameter.

package/dist/serializer.js

@@ -43,6 +43,9 @@ export var ScriptArgumentType;
     ScriptArgumentType[ScriptArgumentType["Serialized"] = 9] = "Serialized";
 })(ScriptArgumentType || (ScriptArgumentType = {}));
 export function serializeTransactionPayload(args) {
+    if (!args) {
+        throw new Error('Transaction payload cannot be undefined');
+    }
     const serializer = new Serializer();
     if ('type' in args || ('arguments' in args && 'type_arguments' in args)) {
         // Some Dapps do not pass the type parameter.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-aptos-provider",
-  "version": "2.2.21",
+  "version": "2.2.23",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -29,10 +29,10 @@
   },
   "dependencies": {
     "@aptos-labs/wallet-standard": "^0.2.0",
-    "@onekeyfe/cross-inpage-provider-core": "2.2.21",
-    "@onekeyfe/cross-inpage-provider-errors": "2.2.21",
-    "@onekeyfe/cross-inpage-provider-types": "2.2.21",
-    "@onekeyfe/extension-bridge-injected": "2.2.21",
+    "@onekeyfe/cross-inpage-provider-core": "2.2.23",
+    "@onekeyfe/cross-inpage-provider-errors": "2.2.23",
+    "@onekeyfe/cross-inpage-provider-types": "2.2.23",
+    "@onekeyfe/extension-bridge-injected": "2.2.23",
     "@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": "8064b9c3177d0a4706d4970d46020283a149d2f7"
+  "gitHead": "3754c167ab566db6a3b93ca8e46f8fc79afc6009"
 }