@manahippo/aptos-wallet-adapter 0.1.16 → 0.1.19
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +16 -16
- package/dist/WalletAdapters/AptosWallet.d.ts +2 -2
- package/dist/WalletAdapters/AptosWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/AptosWallet.js +7 -6
- package/dist/WalletAdapters/AptosWallet.js.map +1 -1
- package/dist/WalletAdapters/BaseAdapter.d.ts +1 -1
- package/dist/WalletAdapters/BaseAdapter.d.ts.map +1 -1
- package/dist/WalletAdapters/FewchaWallet.d.ts +1 -1
- package/dist/WalletAdapters/FewchaWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/FewchaWallet.js +5 -3
- package/dist/WalletAdapters/FewchaWallet.js.map +1 -1
- package/dist/WalletAdapters/HippoExtensionWallet.d.ts +5 -2
- package/dist/WalletAdapters/HippoExtensionWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/HippoExtensionWallet.js +3 -6
- package/dist/WalletAdapters/HippoExtensionWallet.js.map +1 -1
- package/dist/WalletAdapters/HippoWallet.d.ts +1 -1
- package/dist/WalletAdapters/HippoWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/HippoWallet.js +3 -2
- package/dist/WalletAdapters/HippoWallet.js.map +1 -1
- package/dist/WalletAdapters/MartianWallet.d.ts +3 -2
- package/dist/WalletAdapters/MartianWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/MartianWallet.js +17 -10
- package/dist/WalletAdapters/MartianWallet.js.map +1 -1
- package/dist/WalletAdapters/MultiMaskWallet.d.ts +1 -1
- package/dist/WalletAdapters/MultiMaskWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/MultiMaskWallet.js +2 -2
- package/dist/WalletAdapters/MultiMaskWallet.js.map +1 -1
- package/dist/WalletAdapters/NightlyWallet.d.ts +0 -41
- package/dist/WalletAdapters/NightlyWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/NightlyWallet.js +229 -199
- package/dist/WalletAdapters/NightlyWallet.js.map +1 -1
- package/dist/WalletAdapters/index.d.ts +0 -1
- package/dist/WalletAdapters/index.d.ts.map +1 -1
- package/dist/WalletAdapters/index.js +1 -1
- package/dist/WalletAdapters/index.js.map +1 -1
- package/dist/WalletProviders/WalletProvider.d.ts.map +1 -1
- package/dist/WalletProviders/WalletProvider.js.map +1 -1
- package/dist/WalletProviders/useWallet.d.ts +1 -1
- package/dist/WalletProviders/useWallet.d.ts.map +1 -1
- package/dist/WalletProviders/useWallet.js.map +1 -1
- package/dist/config/aptosConstants.d.ts +2 -2
- package/dist/config/aptosConstants.d.ts.map +1 -1
- package/dist/config/aptosConstants.js +1 -1
- package/dist/config/aptosConstants.js.map +1 -1
- package/dist/utilities/util.d.ts +8 -0
- package/dist/utilities/util.d.ts.map +1 -0
- package/dist/utilities/util.js +14 -0
- package/dist/utilities/util.js.map +1 -0
- package/package.json +9 -9
- package/src/WalletAdapters/AptosWallet.ts +9 -11
- package/src/WalletAdapters/BaseAdapter.ts +3 -3
- package/src/WalletAdapters/FewchaWallet.ts +12 -10
- package/src/WalletAdapters/HippoExtensionWallet.ts +13 -10
- package/src/WalletAdapters/HippoWallet.ts +7 -12
- package/src/WalletAdapters/MartianWallet.ts +22 -16
- package/src/WalletAdapters/MultiMaskWallet.ts +6 -6
- package/src/WalletAdapters/NightlyWallet.ts +229 -229
- package/src/WalletAdapters/index.ts +1 -1
- package/src/WalletProviders/WalletProvider.tsx +1 -2
- package/src/WalletProviders/useWallet.ts +3 -4
- package/src/config/aptosConstants.ts +1 -1
- package/src/utilities/util.ts +11 -0
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../src/WalletProviders/WalletProvider.tsx"],"names":[],"mappings":";;;;;;;;;;;;;
|
1
|
+
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../src/WalletProviders/WalletProvider.tsx"],"names":[],"mappings":"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"}
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/// <reference types="react" />
|
2
|
-
import { PendingTransaction, SubmitTransactionRequest
|
2
|
+
import { TransactionPayload, PendingTransaction, SubmitTransactionRequest } from 'aptos/dist/generated';
|
3
3
|
import { AccountKeys, WalletAdapter, WalletName, WalletReadyState } from '../WalletAdapters/BaseAdapter';
|
4
4
|
export interface Wallet {
|
5
5
|
adapter: WalletAdapter;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useWallet.d.ts","sourceRoot":"","sources":["../../src/WalletProviders/useWallet.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,kBAAkB,EAClB,
|
1
|
+
{"version":3,"file":"useWallet.d.ts","sourceRoot":"","sources":["../../src/WalletProviders/useWallet.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,wBAAwB,EACzB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,WAAW,EACX,aAAa,EACb,UAAU,EACV,gBAAgB,EACjB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,WAAW,MAAM;IACrB,OAAO,EAAE,aAAa,CAAC;IACvB,UAAU,EAAE,gBAAgB,CAAC;CAC9B;AAED,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IACrC,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,wBAAwB,CACtB,WAAW,EAAE,kBAAkB,GAG9B,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAE/B,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;CAGrF;AASD,eAAO,MAAM,aAAa,6CAEzB,CAAC;AAEF,wBAAgB,SAAS,IAAI,kBAAkB,CAE9C"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useWallet.js","sourceRoot":"","sources":["../../src/WalletProviders/useWallet.ts"],"names":[],"mappings":";;;AAKA,iCAAkD;
|
1
|
+
{"version":3,"file":"useWallet.js","sourceRoot":"","sources":["../../src/WalletProviders/useWallet.ts"],"names":[],"mappings":";;;AAKA,iCAAkD;AAmClD,MAAM,eAAe,GAAG;IACtB,WAAW,EAAE,KAAK;IAClB,UAAU,EAAE,KAAK;IACjB,SAAS,EAAE,KAAK;IAChB,aAAa,EAAE,KAAK;CACC,CAAC;AAEX,QAAA,aAAa,GAAG,IAAA,qBAAa,EACxC,eAAqC,CACtC,CAAC;AAEF,SAAgB,SAAS;IACvB,OAAO,IAAA,kBAAU,EAAC,qBAAa,CAAC,CAAC;AACnC,CAAC;AAFD,8BAEC"}
|
@@ -1,10 +1,10 @@
|
|
1
1
|
import { AptosClient, FaucetClient } from 'aptos';
|
2
2
|
export declare const WEBWALLET_URL = "https://hippo-wallet-test.web.app";
|
3
3
|
export declare const LOCAL_NODE_URL = "http://127.0.0.1:8080";
|
4
|
-
export declare const DEVNET_NODE_URL = "https://fullnode.devnet.aptoslabs.com";
|
4
|
+
export declare const DEVNET_NODE_URL = "https://fullnode.devnet.aptoslabs.com/v1";
|
5
5
|
export declare const LOCAL_FAUCET_URL = "http://127.0.0.1:8000";
|
6
6
|
export declare const DEVNET_FAUCET_URL = "https://faucet.devnet.aptoslabs.com";
|
7
|
-
export declare const NODE_URL = "https://fullnode.devnet.aptoslabs.com";
|
7
|
+
export declare const NODE_URL = "https://fullnode.devnet.aptoslabs.com/v1";
|
8
8
|
export declare const FAUCET_URL = "https://faucet.devnet.aptoslabs.com";
|
9
9
|
export declare const aptosClient: AptosClient;
|
10
10
|
export declare const faucetClient: FaucetClient;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"aptosConstants.d.ts","sourceRoot":"","sources":["../../src/config/aptosConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAElD,eAAO,MAAM,aAAa,sCAAsC,CAAC;AAGjE,eAAO,MAAM,cAAc,0BAA0B,CAAC;AACtD,eAAO,MAAM,eAAe,
|
1
|
+
{"version":3,"file":"aptosConstants.d.ts","sourceRoot":"","sources":["../../src/config/aptosConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAElD,eAAO,MAAM,aAAa,sCAAsC,CAAC;AAGjE,eAAO,MAAM,cAAc,0BAA0B,CAAC;AACtD,eAAO,MAAM,eAAe,6CAA6C,CAAC;AAC1E,eAAO,MAAM,gBAAgB,0BAA0B,CAAC;AACxD,eAAO,MAAM,iBAAiB,wCAAwC,CAAC;AAEvE,eAAO,MAAM,QAAQ,6CAAkB,CAAC;AACxC,eAAO,MAAM,UAAU,wCAAoB,CAAC;AAE5C,eAAO,MAAM,WAAW,aAA4B,CAAC;AACrD,eAAO,MAAM,YAAY,cAAyC,CAAC"}
|
@@ -5,7 +5,7 @@ const aptos_1 = require("aptos");
|
|
5
5
|
exports.WEBWALLET_URL = 'https://hippo-wallet-test.web.app';
|
6
6
|
// export const WEBWALLET_URL = 'http://localhost:3030';
|
7
7
|
exports.LOCAL_NODE_URL = 'http://127.0.0.1:8080';
|
8
|
-
exports.DEVNET_NODE_URL = 'https://fullnode.devnet.aptoslabs.com';
|
8
|
+
exports.DEVNET_NODE_URL = 'https://fullnode.devnet.aptoslabs.com/v1';
|
9
9
|
exports.LOCAL_FAUCET_URL = 'http://127.0.0.1:8000';
|
10
10
|
exports.DEVNET_FAUCET_URL = 'https://faucet.devnet.aptoslabs.com';
|
11
11
|
exports.NODE_URL = exports.DEVNET_NODE_URL;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"aptosConstants.js","sourceRoot":"","sources":["../../src/config/aptosConstants.ts"],"names":[],"mappings":";;;AAAA,iCAAkD;AAErC,QAAA,aAAa,GAAG,mCAAmC,CAAC;AACjE,wDAAwD;AAE3C,QAAA,cAAc,GAAG,uBAAuB,CAAC;AACzC,QAAA,eAAe,GAAG,
|
1
|
+
{"version":3,"file":"aptosConstants.js","sourceRoot":"","sources":["../../src/config/aptosConstants.ts"],"names":[],"mappings":";;;AAAA,iCAAkD;AAErC,QAAA,aAAa,GAAG,mCAAmC,CAAC;AACjE,wDAAwD;AAE3C,QAAA,cAAc,GAAG,uBAAuB,CAAC;AACzC,QAAA,eAAe,GAAG,0CAA0C,CAAC;AAC7D,QAAA,gBAAgB,GAAG,uBAAuB,CAAC;AAC3C,QAAA,iBAAiB,GAAG,qCAAqC,CAAC;AAE1D,QAAA,QAAQ,GAAG,uBAAe,CAAC;AAC3B,QAAA,UAAU,GAAG,yBAAiB,CAAC;AAE/B,QAAA,WAAW,GAAG,IAAI,mBAAW,CAAC,gBAAQ,CAAC,CAAC;AACxC,QAAA,YAAY,GAAG,IAAI,oBAAY,CAAC,gBAAQ,EAAE,kBAAU,CAAC,CAAC"}
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/utilities/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAA4C,MAAM,sBAAsB,CAAC;AAEpG,eAAO,MAAM,aAAa,YAAa,kBAAkB;;;;;CAQxD,CAAC"}
|
@@ -0,0 +1,14 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.payloadV1ToV0 = void 0;
|
4
|
+
const payloadV1ToV0 = (payload) => {
|
5
|
+
const v1 = payload;
|
6
|
+
return {
|
7
|
+
type: 'script_function_payload',
|
8
|
+
function: `${v1.function.module.address}::${v1.function.module.name}::${v1.function.name}`,
|
9
|
+
type_arguments: v1.type_arguments,
|
10
|
+
arguments: v1.arguments
|
11
|
+
};
|
12
|
+
};
|
13
|
+
exports.payloadV1ToV0 = payloadV1ToV0;
|
14
|
+
//# sourceMappingURL=util.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/utilities/util.ts"],"names":[],"mappings":";;;AAEO,MAAM,aAAa,GAAG,CAAC,OAA2B,EAAE,EAAE;IAC3D,MAAM,EAAE,GAAG,OAAmD,CAAC;IAC/D,OAAO;QACL,IAAI,EAAE,yBAAyB;QAC/B,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,KAAK,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE;QAC1F,cAAc,EAAE,EAAE,CAAC,cAAc;QACjC,SAAS,EAAE,EAAE,CAAC,SAAS;KACxB,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,aAAa,iBAQxB"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@manahippo/aptos-wallet-adapter",
|
3
|
-
"version": "0.1.
|
3
|
+
"version": "0.1.19",
|
4
4
|
"main": "dist/index.js",
|
5
5
|
"typings": "dist/index.d.ts",
|
6
6
|
"files": [
|
@@ -15,20 +15,20 @@
|
|
15
15
|
"react-dom": "^18.1.0"
|
16
16
|
},
|
17
17
|
"devDependencies": {
|
18
|
-
"@types/jest": "^27.0.1",
|
19
|
-
"@types/node": "^16.7.13",
|
20
|
-
"@types/react": "^18.0.0",
|
21
|
-
"aptos": "^1.2.0",
|
22
18
|
"eslint-config-airbnb-typescript": "^17.0.0",
|
23
19
|
"eslint-config-prettier": "^8.5.0",
|
24
20
|
"eslint-plugin-prettier": "^4.2.1",
|
25
21
|
"eslint-plugin-react": "^7.30.1",
|
26
22
|
"eslint-plugin-react-hooks": "^4.6.0",
|
27
|
-
"
|
28
|
-
"prettier": "^2.7.1",
|
29
|
-
"typescript": "^4.7.4"
|
23
|
+
"prettier": "^2.7.1"
|
30
24
|
},
|
31
25
|
"dependencies": {
|
32
|
-
"@fewcha/web3": "^0.1.
|
26
|
+
"@fewcha/web3": "^0.1.13",
|
27
|
+
"@types/jest": "^27.0.1",
|
28
|
+
"@types/node": "^16.7.13",
|
29
|
+
"@types/react": "^18.0.0",
|
30
|
+
"aptos": "^1.3.5",
|
31
|
+
"eventemitter3": "^4.0.7",
|
32
|
+
"typescript": "^4.4.2"
|
33
33
|
}
|
34
34
|
}
|
@@ -2,7 +2,8 @@ import {
|
|
2
2
|
PendingTransaction,
|
3
3
|
SubmitTransactionRequest,
|
4
4
|
TransactionPayload
|
5
|
-
} from 'aptos/dist/
|
5
|
+
} from 'aptos/dist/generated';
|
6
|
+
import { payloadV1ToV0 } from '../utilities/util';
|
6
7
|
import {
|
7
8
|
WalletDisconnectionError,
|
8
9
|
WalletNotConnectedError,
|
@@ -11,10 +12,7 @@ import {
|
|
11
12
|
} from '../WalletProviders/errors';
|
12
13
|
import {
|
13
14
|
AccountKeys,
|
14
|
-
Address,
|
15
|
-
AuthKey,
|
16
15
|
BaseWalletAdapter,
|
17
|
-
PublicKey,
|
18
16
|
scopePollingDetectionStrategy,
|
19
17
|
WalletName,
|
20
18
|
WalletReadyState
|
@@ -25,7 +23,7 @@ interface IAptosWallet {
|
|
25
23
|
connect: () => Promise<{ address: string }>;
|
26
24
|
account: () => Promise<string>;
|
27
25
|
isConnected: () => Promise<boolean>;
|
28
|
-
signAndSubmitTransaction(transaction: any): Promise<
|
26
|
+
signAndSubmitTransaction(transaction: any): Promise<PendingTransaction>;
|
29
27
|
signTransaction(transaction: any): Promise<void>;
|
30
28
|
disconnect(): Promise<void>;
|
31
29
|
}
|
@@ -94,7 +92,7 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
|
|
94
92
|
return {
|
95
93
|
publicKey: this._wallet?.publicKey || null,
|
96
94
|
address: this._wallet?.address || null,
|
97
|
-
authKey: this._wallet?.
|
95
|
+
authKey: this._wallet?.authKey || null
|
98
96
|
};
|
99
97
|
}
|
100
98
|
|
@@ -166,7 +164,7 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
|
|
166
164
|
if (response) {
|
167
165
|
return response;
|
168
166
|
} else {
|
169
|
-
throw new Error('Transaction failed');
|
167
|
+
throw new Error('Sign Transaction failed');
|
170
168
|
}
|
171
169
|
} catch (error: any) {
|
172
170
|
throw new WalletSignTransactionError(error?.message, error);
|
@@ -180,18 +178,18 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
|
|
180
178
|
async signAndSubmitTransaction(transaction: TransactionPayload): Promise<PendingTransaction> {
|
181
179
|
try {
|
182
180
|
const wallet = this._wallet;
|
183
|
-
|
181
|
+
const provider = this._provider || window.aptos;
|
182
|
+
if (!wallet || !provider) throw new WalletNotConnectedError();
|
184
183
|
|
185
184
|
try {
|
186
|
-
const
|
187
|
-
const response = await provider?.signAndSubmitTransaction(transaction);
|
185
|
+
const response = await provider?.signAndSubmitTransaction(payloadV1ToV0(transaction));
|
188
186
|
if (response) {
|
189
187
|
return response;
|
190
188
|
} else {
|
191
189
|
throw new Error('Transaction failed');
|
192
190
|
}
|
193
191
|
} catch (error: any) {
|
194
|
-
const errMsg = error
|
192
|
+
const errMsg = error.message;
|
195
193
|
throw new WalletSignTransactionError(errMsg);
|
196
194
|
}
|
197
195
|
} catch (error: any) {
|
@@ -1,9 +1,9 @@
|
|
1
1
|
import { MaybeHexString } from 'aptos';
|
2
2
|
import {
|
3
|
+
TransactionPayload,
|
3
4
|
PendingTransaction,
|
4
|
-
SubmitTransactionRequest
|
5
|
-
|
6
|
-
} from 'aptos/dist/api/data-contracts';
|
5
|
+
SubmitTransactionRequest
|
6
|
+
} from 'aptos/dist/generated';
|
7
7
|
import EventEmitter from 'eventemitter3';
|
8
8
|
|
9
9
|
declare global {
|
@@ -1,9 +1,4 @@
|
|
1
|
-
import {
|
2
|
-
PendingTransaction,
|
3
|
-
SubmitTransactionRequest,
|
4
|
-
TransactionPayload
|
5
|
-
} from 'aptos/dist/api/data-contracts';
|
6
|
-
import { aptosClient, WEBWALLET_URL } from '../config/aptosConstants';
|
1
|
+
import { WEBWALLET_URL } from '../config/aptosConstants';
|
7
2
|
import {
|
8
3
|
WalletDisconnectionError,
|
9
4
|
WalletNotConnectedError,
|
@@ -18,6 +13,11 @@ import {
|
|
18
13
|
WalletName,
|
19
14
|
WalletReadyState
|
20
15
|
} from './BaseAdapter';
|
16
|
+
import {
|
17
|
+
TransactionPayload,
|
18
|
+
SubmitTransactionRequest,
|
19
|
+
PendingTransaction
|
20
|
+
} from 'aptos/dist/generated';
|
21
21
|
|
22
22
|
export const FewchaWalletName = 'Fewcha Wallet' as WalletName<'Fewcha Wallet'>;
|
23
23
|
|
@@ -79,7 +79,7 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
|
|
79
79
|
}
|
80
80
|
|
81
81
|
window.addEventListener('aptos#connected', async () => {
|
82
|
-
const publicAccount = await this._provider?.account();
|
82
|
+
const publicAccount: any = await this._provider?.account();
|
83
83
|
const isConnected = await this._provider?.isConnected();
|
84
84
|
if (publicAccount?.publicKey && isConnected) {
|
85
85
|
this._wallet = {
|
@@ -105,7 +105,7 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
|
|
105
105
|
return {
|
106
106
|
publicKey: this._wallet?.publicKey || null,
|
107
107
|
address: this._wallet?.address || null,
|
108
|
-
authKey: this._wallet?.
|
108
|
+
authKey: this._wallet?.authKey || null
|
109
109
|
};
|
110
110
|
}
|
111
111
|
|
@@ -194,8 +194,10 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
|
|
194
194
|
|
195
195
|
try {
|
196
196
|
const provider = this._provider;
|
197
|
-
const tx = await
|
198
|
-
|
197
|
+
const tx = await provider?.generateTransaction(transaction);
|
198
|
+
if (tx) {
|
199
|
+
await provider?.signAndSubmitTransaction(tx.data);
|
200
|
+
}
|
199
201
|
|
200
202
|
const promise = await new Promise((resolve, reject) => {
|
201
203
|
this.once('success', resolve);
|
@@ -1,8 +1,9 @@
|
|
1
|
+
import { MaybeHexString } from 'aptos';
|
1
2
|
import {
|
2
|
-
|
3
|
+
TransactionPayload,
|
3
4
|
SubmitTransactionRequest,
|
4
|
-
|
5
|
-
} from 'aptos/dist/
|
5
|
+
PendingTransaction
|
6
|
+
} from 'aptos/dist/generated';
|
6
7
|
import {
|
7
8
|
WalletDisconnectionError,
|
8
9
|
WalletNotConnectedError,
|
@@ -12,14 +13,17 @@ import {
|
|
12
13
|
import {
|
13
14
|
AccountKeys,
|
14
15
|
BaseWalletAdapter,
|
15
|
-
PublicKey,
|
16
16
|
scopePollingDetectionStrategy,
|
17
17
|
WalletName,
|
18
18
|
WalletReadyState
|
19
19
|
} from './BaseAdapter';
|
20
20
|
|
21
21
|
interface IHippoWallet {
|
22
|
-
connect: () => Promise<{
|
22
|
+
connect: () => Promise<{
|
23
|
+
address: MaybeHexString;
|
24
|
+
publicKey: MaybeHexString;
|
25
|
+
authKey: MaybeHexString;
|
26
|
+
}>;
|
23
27
|
account: () => Promise<string>;
|
24
28
|
isConnected: () => Promise<boolean>;
|
25
29
|
signAndSubmitTransaction(transaction: any): Promise<any>;
|
@@ -33,8 +37,7 @@ interface HippoWindow extends Window {
|
|
33
37
|
|
34
38
|
declare const window: HippoWindow;
|
35
39
|
|
36
|
-
export const HippoExtensionWalletName =
|
37
|
-
'Hippo Wallet' as WalletName<'Hippo Wallet'>;
|
40
|
+
export const HippoExtensionWalletName = 'Hippo Wallet' as WalletName<'Hippo Wallet'>;
|
38
41
|
|
39
42
|
export interface HippoExtensionWalletAdapterConfig {
|
40
43
|
provider?: IHippoWallet;
|
@@ -45,7 +48,7 @@ export interface HippoExtensionWalletAdapterConfig {
|
|
45
48
|
export class HippoExtensionWalletAdapter extends BaseWalletAdapter {
|
46
49
|
name = HippoExtensionWalletName;
|
47
50
|
|
48
|
-
url = 'https://hippo-wallet
|
51
|
+
url = 'https://github.com/hippospace/hippo-wallet';
|
49
52
|
|
50
53
|
icon = 'https://ui-test1-22e7c.web.app/static/media/hippo_logo.ecded6bf411652de9b7f.png';
|
51
54
|
|
@@ -92,7 +95,7 @@ export class HippoExtensionWalletAdapter extends BaseWalletAdapter {
|
|
92
95
|
return {
|
93
96
|
publicKey: this._wallet?.publicKey || null,
|
94
97
|
address: this._wallet?.address || null,
|
95
|
-
authKey: this._wallet?.
|
98
|
+
authKey: this._wallet?.authKey || null
|
96
99
|
};
|
97
100
|
}
|
98
101
|
|
@@ -124,7 +127,7 @@ export class HippoExtensionWalletAdapter extends BaseWalletAdapter {
|
|
124
127
|
const response = await provider?.connect();
|
125
128
|
|
126
129
|
this._wallet = {
|
127
|
-
|
130
|
+
...response,
|
128
131
|
isConnected: true
|
129
132
|
};
|
130
133
|
|
@@ -1,22 +1,16 @@
|
|
1
1
|
import { MaybeHexString } from 'aptos';
|
2
2
|
import {
|
3
|
-
|
3
|
+
TransactionPayload,
|
4
4
|
SubmitTransactionRequest,
|
5
|
-
|
6
|
-
} from 'aptos/dist/
|
5
|
+
PendingTransaction
|
6
|
+
} from 'aptos/dist/generated';
|
7
7
|
import { WEBWALLET_URL } from '../config/aptosConstants';
|
8
8
|
import {
|
9
9
|
WalletNotConnectedError,
|
10
10
|
WalletNotReadyError,
|
11
11
|
WalletSignAndSubmitMessageError
|
12
12
|
} from '../WalletProviders/errors';
|
13
|
-
import {
|
14
|
-
AccountKeys,
|
15
|
-
BaseWalletAdapter,
|
16
|
-
PublicKey,
|
17
|
-
WalletName,
|
18
|
-
WalletReadyState
|
19
|
-
} from './BaseAdapter';
|
13
|
+
import { AccountKeys, BaseWalletAdapter, WalletName, WalletReadyState } from './BaseAdapter';
|
20
14
|
|
21
15
|
export const HippoWalletName = 'Hippo Web Wallet' as WalletName<'Hippo Web Wallet'>;
|
22
16
|
|
@@ -63,7 +57,7 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
|
|
63
57
|
return {
|
64
58
|
publicKey: this._wallet?.publicKey || null,
|
65
59
|
address: this._wallet?.address || null,
|
66
|
-
authKey: this._wallet?.
|
60
|
+
authKey: this._wallet?.authKey || null
|
67
61
|
};
|
68
62
|
}
|
69
63
|
|
@@ -154,7 +148,8 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
|
|
154
148
|
method: 'signTransaction',
|
155
149
|
payload: transaction
|
156
150
|
}),
|
157
|
-
origin: window.location.origin
|
151
|
+
origin: window.location.origin,
|
152
|
+
isPopUp: 'true'
|
158
153
|
}).toString();
|
159
154
|
const popup = window.open(
|
160
155
|
`${WEBWALLET_URL}?${request}`,
|
@@ -1,11 +1,10 @@
|
|
1
1
|
import { MaybeHexString } from 'aptos';
|
2
2
|
import {
|
3
|
-
|
4
|
-
ScriptFunctionPayload,
|
3
|
+
TransactionPayload,
|
5
4
|
SubmitTransactionRequest,
|
6
|
-
|
7
|
-
} from 'aptos/dist/
|
8
|
-
import {
|
5
|
+
PendingTransaction
|
6
|
+
} from 'aptos/dist/generated';
|
7
|
+
import { payloadV1ToV0 } from '../utilities/util';
|
9
8
|
import {
|
10
9
|
WalletDisconnectionError,
|
11
10
|
WalletNotConnectedError,
|
@@ -15,7 +14,6 @@ import {
|
|
15
14
|
import {
|
16
15
|
AccountKeys,
|
17
16
|
BaseWalletAdapter,
|
18
|
-
PublicKey,
|
19
17
|
scopePollingDetectionStrategy,
|
20
18
|
WalletName,
|
21
19
|
WalletReadyState
|
@@ -31,13 +29,14 @@ interface ConnectMartianAccount {
|
|
31
29
|
interface MartianAccount {
|
32
30
|
address: MaybeHexString;
|
33
31
|
publicKey: MaybeHexString;
|
34
|
-
|
32
|
+
authKey: MaybeHexString;
|
35
33
|
isConnected: boolean;
|
36
34
|
}
|
37
35
|
interface IMartianWallet {
|
38
36
|
connect: (params?: any) => Promise<ConnectMartianAccount>;
|
39
37
|
account(): Promise<MartianAccount>;
|
40
38
|
isConnected(): Promise<boolean>;
|
39
|
+
generateTransaction(sender: MaybeHexString, payload: any): Promise<any>;
|
41
40
|
signAndSubmitTransaction(transaction: any): Promise<string>;
|
42
41
|
// signTransaction(transaction: any): Promise<void>;
|
43
42
|
disconnect(): Promise<void>;
|
@@ -108,7 +107,7 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
|
|
108
107
|
return {
|
109
108
|
publicKey: this._wallet?.publicKey || null,
|
110
109
|
address: this._wallet?.address || null,
|
111
|
-
authKey: this._wallet?.
|
110
|
+
authKey: this._wallet?.authKey || null
|
112
111
|
};
|
113
112
|
}
|
114
113
|
|
@@ -140,7 +139,9 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
|
|
140
139
|
this._connecting = true;
|
141
140
|
|
142
141
|
const provider = window.martian;
|
143
|
-
|
142
|
+
const isConnected = await provider?.isConnected();
|
143
|
+
if (isConnected) await provider?.disconnect();
|
144
|
+
// console.log(4, isConnected);
|
144
145
|
const response = await provider?.connect();
|
145
146
|
// console.log(5, response);
|
146
147
|
|
@@ -149,6 +150,7 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
|
|
149
150
|
}
|
150
151
|
|
151
152
|
const walletAccount = await provider?.account();
|
153
|
+
// console.log(6, walletAccount);
|
152
154
|
if (walletAccount) {
|
153
155
|
this._wallet = {
|
154
156
|
...walletAccount,
|
@@ -189,15 +191,15 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
|
|
189
191
|
const wallet = this._wallet;
|
190
192
|
const provider = this._provider;
|
191
193
|
if (!wallet) throw new WalletNotConnectedError();
|
192
|
-
const tx = await
|
194
|
+
const tx = await provider?.generateTransaction(wallet.address || '', transactionPyld);
|
195
|
+
if (!tx) throw new WalletSignTransactionError('No transaction');
|
193
196
|
const response = await provider?.signAndSubmitTransaction(tx);
|
194
197
|
|
195
198
|
if (!response) {
|
196
199
|
throw new WalletSignTransactionError('No response');
|
197
200
|
}
|
198
|
-
|
199
|
-
|
200
|
-
} as PendingTransaction;
|
201
|
+
const result = { hash: response } as any;
|
202
|
+
return result as SubmitTransactionRequest;
|
201
203
|
} catch (error: any) {
|
202
204
|
this.emit('error', error);
|
203
205
|
throw error;
|
@@ -207,9 +209,13 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
|
|
207
209
|
async signAndSubmitTransaction(transactionPyld: TransactionPayload): Promise<PendingTransaction> {
|
208
210
|
try {
|
209
211
|
const wallet = this._wallet;
|
210
|
-
const provider = this._provider;
|
211
|
-
if (!wallet) throw new WalletNotConnectedError();
|
212
|
-
const tx = await
|
212
|
+
const provider = this._provider || window.martian;
|
213
|
+
if (!wallet || !provider) throw new WalletNotConnectedError();
|
214
|
+
const tx = await provider.generateTransaction(
|
215
|
+
wallet.address.toString() || '',
|
216
|
+
payloadV1ToV0(transactionPyld)
|
217
|
+
);
|
218
|
+
if (!tx) throw new WalletSignTransactionError('Cannot generate transaction');
|
213
219
|
const response = await provider?.signAndSubmitTransaction(tx);
|
214
220
|
|
215
221
|
if (!response) {
|
@@ -1,9 +1,9 @@
|
|
1
1
|
import {
|
2
|
-
|
3
|
-
ScriptFunctionPayload,
|
2
|
+
TransactionPayload,
|
4
3
|
SubmitTransactionRequest,
|
5
|
-
|
6
|
-
|
4
|
+
PendingTransaction,
|
5
|
+
ScriptFunctionPayload
|
6
|
+
} from 'aptos/dist/generated';
|
7
7
|
import {
|
8
8
|
WalletDisconnectionError,
|
9
9
|
WalletNotConnectedError,
|
@@ -96,7 +96,7 @@ export class MultiMaskWalletAdapter extends BaseWalletAdapter {
|
|
96
96
|
return {
|
97
97
|
publicKey: this._wallet?.publicKey || null,
|
98
98
|
address: this._wallet?.address || null,
|
99
|
-
authKey: this._wallet?.
|
99
|
+
authKey: this._wallet?.authKey || null
|
100
100
|
};
|
101
101
|
}
|
102
102
|
|
@@ -216,7 +216,7 @@ export class MultiMaskWalletAdapter extends BaseWalletAdapter {
|
|
216
216
|
wallet.currentProvider.sendAsync(
|
217
217
|
{
|
218
218
|
method: 'eth_sendTransaction',
|
219
|
-
params: [{ from: transaction.function.split(':')[0] }]
|
219
|
+
params: [{ from: transaction.function.name.split(':')[0] }]
|
220
220
|
},
|
221
221
|
(error, resp: any) => {
|
222
222
|
console.log('signTransaction', error, resp);
|