@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
package/README.md
CHANGED
|
@@ -41,7 +41,7 @@ Wallets source code [here](https://github.com/hippospace/aptos-wallet-adapter/tr
|
|
|
41
41
|
|
|
42
42
|
# Use React Provider
|
|
43
43
|
|
|
44
|
-
```
|
|
44
|
+
```typescript
|
|
45
45
|
import React from "react";
|
|
46
46
|
import {
|
|
47
47
|
WalletProvider,
|
|
@@ -77,7 +77,7 @@ export default App;
|
|
|
77
77
|
|
|
78
78
|
# Web3 Hook
|
|
79
79
|
|
|
80
|
-
```
|
|
80
|
+
```typescript
|
|
81
81
|
import { useWallet } from '@manahippo/aptos-wallet-adapter';
|
|
82
82
|
|
|
83
83
|
const { connected, account, ...rest } = useWallet();
|
|
@@ -99,9 +99,9 @@ const { connected, account, ...rest } = useWallet();
|
|
|
99
99
|
|
|
100
100
|
# Connect & Disconnect
|
|
101
101
|
|
|
102
|
-
```
|
|
103
|
-
|
|
104
|
-
|
|
102
|
+
```typescript
|
|
103
|
+
const { wallets, connect, disconnect, isConnected } = useWallet();
|
|
104
|
+
const wallet = 'Aptos Wallet' // Name can be found in the adapters files in https://github.com/hippospace/aptos-wallet-adapter/tree/main/src/WalletAdatpers
|
|
105
105
|
|
|
106
106
|
if (!isConnected) {
|
|
107
107
|
return (
|
|
@@ -128,7 +128,7 @@ if (!isConnected) {
|
|
|
128
128
|
|
|
129
129
|
# Hippo Wallet Client
|
|
130
130
|
|
|
131
|
-
```
|
|
131
|
+
```typescript
|
|
132
132
|
import { HippoSwapClient, HippoWalletClient } from '@manahippo/hippo-sdk';
|
|
133
133
|
import { getParserRepo } from '@manahippo/hippo-sdk';
|
|
134
134
|
|
|
@@ -149,7 +149,7 @@ export const hippoWalletClient = async (account: ActiveAptosWallet) => {
|
|
|
149
149
|
|
|
150
150
|
# Hippo Swap Client
|
|
151
151
|
|
|
152
|
-
```
|
|
152
|
+
```typescript
|
|
153
153
|
import { HippoSwapClient, HippoWalletClient } from '@manahippo/hippo-sdk';
|
|
154
154
|
import { getParserRepo } from '@manahippo/hippo-sdk/';
|
|
155
155
|
|
|
@@ -166,22 +166,22 @@ export const hippoSwapClient = async () => {
|
|
|
166
166
|
|
|
167
167
|
**Request faucet**
|
|
168
168
|
|
|
169
|
-
```
|
|
169
|
+
```typescript
|
|
170
170
|
const { signAndSubmitTransaction } = useWallet();
|
|
171
171
|
|
|
172
172
|
const payload = await hippoWallet?.makeFaucetMintToPayload(uiAmtUsed, symbol);
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
}
|
|
173
|
+
if (payload) {
|
|
174
|
+
const result = await signAndSubmitTransaction(payload);
|
|
175
|
+
if (result) {
|
|
176
|
+
message.success('Transaction Success');
|
|
177
|
+
await hippoWallet?.refreshStores();
|
|
179
178
|
}
|
|
179
|
+
}
|
|
180
180
|
```
|
|
181
181
|
|
|
182
182
|
**Swap Token**
|
|
183
183
|
|
|
184
|
-
```
|
|
184
|
+
```typescript
|
|
185
185
|
const bestQuote = await hippoSwap.getBestQuoteBySymbols(fromSymbol, toSymbol, uiAmtIn, 3);
|
|
186
186
|
if (!bestQuote) {
|
|
187
187
|
throw new Error(`No route exists from ${fromSymbol} to ${toSymbol}`);
|
|
@@ -196,7 +196,7 @@ if (result) {
|
|
|
196
196
|
|
|
197
197
|
**Deposit Transaction**
|
|
198
198
|
|
|
199
|
-
```
|
|
199
|
+
```typescript
|
|
200
200
|
const pool = hippoSwap.getDirectPoolsBySymbolsAndPoolType(lhsSymbol, rhsSymbol, poolType);
|
|
201
201
|
if (pool.length === 0) {
|
|
202
202
|
throw new Error('Desired pool does not exist');
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PendingTransaction, SubmitTransactionRequest, TransactionPayload } from 'aptos/dist/
|
|
1
|
+
import { PendingTransaction, SubmitTransactionRequest, TransactionPayload } from 'aptos/dist/generated';
|
|
2
2
|
import { AccountKeys, BaseWalletAdapter, WalletName, WalletReadyState } from './BaseAdapter';
|
|
3
3
|
interface IAptosWallet {
|
|
4
4
|
requestId: number;
|
|
@@ -7,7 +7,7 @@ interface IAptosWallet {
|
|
|
7
7
|
}>;
|
|
8
8
|
account: () => Promise<string>;
|
|
9
9
|
isConnected: () => Promise<boolean>;
|
|
10
|
-
signAndSubmitTransaction(transaction: any): Promise<
|
|
10
|
+
signAndSubmitTransaction(transaction: any): Promise<PendingTransaction>;
|
|
11
11
|
signTransaction(transaction: any): Promise<void>;
|
|
12
12
|
disconnect(): Promise<void>;
|
|
13
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AptosWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/AptosWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM
|
|
1
|
+
{"version":3,"file":"AptosWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/AptosWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;AAQ9B,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,YAAY;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5C,OAAO,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,wBAAwB,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACxE,eAAe,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B;AAQD,eAAO,MAAM,eAAe,4BAA+C,CAAC;AAE5E,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,kBAAmB,SAAQ,iBAAiB;IACvD,IAAI,6BAAmB;IAEvB,GAAG,SAAwD;IAE3D,IAAI,SAAwE;IAE5E,SAAS,CAAC,SAAS,EAAE,YAAY,GAAG,SAAS,CAAC;IAG9C,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAGJ;IAEnC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAE/B,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;gBAElB,EAGV,OAAe,EAChB,GAAE,wBAA6B;IAqBhC,IAAI,aAAa,IAAI,WAAW,CAM/B;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,UAAU,IAAI,gBAAgB,CAEjC;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAsBnF,wBAAwB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAsB7F"}
|
|
@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.AptosWalletAdapter = exports.AptosWalletName = void 0;
|
|
13
|
+
const util_1 = require("../utilities/util");
|
|
13
14
|
const errors_1 = require("../WalletProviders/errors");
|
|
14
15
|
const BaseAdapter_1 = require("./BaseAdapter");
|
|
15
16
|
exports.AptosWalletName = 'Aptos Wallet';
|
|
@@ -46,7 +47,7 @@ class AptosWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
46
47
|
return {
|
|
47
48
|
publicKey: ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.publicKey) || null,
|
|
48
49
|
address: ((_b = this._wallet) === null || _b === void 0 ? void 0 : _b.address) || null,
|
|
49
|
-
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.
|
|
50
|
+
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.authKey) || null
|
|
50
51
|
};
|
|
51
52
|
}
|
|
52
53
|
get connecting() {
|
|
@@ -114,7 +115,7 @@ class AptosWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
114
115
|
return response;
|
|
115
116
|
}
|
|
116
117
|
else {
|
|
117
|
-
throw new Error('Transaction failed');
|
|
118
|
+
throw new Error('Sign Transaction failed');
|
|
118
119
|
}
|
|
119
120
|
}
|
|
120
121
|
catch (error) {
|
|
@@ -131,11 +132,11 @@ class AptosWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
131
132
|
return __awaiter(this, void 0, void 0, function* () {
|
|
132
133
|
try {
|
|
133
134
|
const wallet = this._wallet;
|
|
134
|
-
|
|
135
|
+
const provider = this._provider || window.aptos;
|
|
136
|
+
if (!wallet || !provider)
|
|
135
137
|
throw new errors_1.WalletNotConnectedError();
|
|
136
138
|
try {
|
|
137
|
-
const
|
|
138
|
-
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signAndSubmitTransaction(transaction));
|
|
139
|
+
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signAndSubmitTransaction((0, util_1.payloadV1ToV0)(transaction)));
|
|
139
140
|
if (response) {
|
|
140
141
|
return response;
|
|
141
142
|
}
|
|
@@ -144,7 +145,7 @@ class AptosWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
144
145
|
}
|
|
145
146
|
}
|
|
146
147
|
catch (error) {
|
|
147
|
-
const errMsg = error
|
|
148
|
+
const errMsg = error.message;
|
|
148
149
|
throw new errors_1.WalletSignTransactionError(errMsg);
|
|
149
150
|
}
|
|
150
151
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AptosWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/AptosWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AAKA,sDAKmC;AACnC,+
|
|
1
|
+
{"version":3,"file":"AptosWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/AptosWallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { MaybeHexString } from 'aptos';
|
|
2
|
-
import { PendingTransaction, SubmitTransactionRequest
|
|
2
|
+
import { TransactionPayload, PendingTransaction, SubmitTransactionRequest } from 'aptos/dist/generated';
|
|
3
3
|
import EventEmitter from 'eventemitter3';
|
|
4
4
|
declare global {
|
|
5
5
|
interface Window {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseAdapter.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/BaseAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EACL,kBAAkB,EAClB,
|
|
1
|
+
{"version":3,"file":"BaseAdapter.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/BaseAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { PendingTransaction, SubmitTransactionRequest, TransactionPayload } from 'aptos/dist/api/data-contracts';
|
|
2
1
|
import { Web3ProviderType } from '@fewcha/web3';
|
|
3
2
|
import { AccountKeys, BaseWalletAdapter, WalletName, WalletReadyState } from './BaseAdapter';
|
|
3
|
+
import { TransactionPayload, SubmitTransactionRequest, PendingTransaction } from 'aptos/dist/generated';
|
|
4
4
|
export declare const FewchaWalletName: WalletName<"Fewcha Wallet">;
|
|
5
5
|
export interface FewchaAdapterConfig {
|
|
6
6
|
provider?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FewchaWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"FewchaWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":"AAOA,OAAa,EAAgB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;AAE9B,eAAO,MAAM,gBAAgB,6BAAiD,CAAC;AAU/E,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,mBAAoB,SAAQ,iBAAiB;IACxD,IAAI,8BAAoB;IAExB,GAAG,SAAyB;IAE5B,IAAI,SAAwE;IAE5E,SAAS,CAAC,SAAS,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAGlD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAA8B;IAErE,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAE/B,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;gBAElB,EAGV,OAAe,EAChB,GAAE,mBAAwB;IA4C3B,IAAI,aAAa,IAAI,WAAW,CAM/B;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,UAAU,IAAI,gBAAgB,CAEjC;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA0BxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAc3B,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IA0BnF,wBAAwB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;CA4B7F"}
|
|
@@ -89,7 +89,7 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
89
89
|
return {
|
|
90
90
|
publicKey: ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.publicKey) || null,
|
|
91
91
|
address: ((_b = this._wallet) === null || _b === void 0 ? void 0 : _b.address) || null,
|
|
92
|
-
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.
|
|
92
|
+
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.authKey) || null
|
|
93
93
|
};
|
|
94
94
|
}
|
|
95
95
|
get connecting() {
|
|
@@ -176,8 +176,10 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
176
176
|
throw new errors_1.WalletNotConnectedError();
|
|
177
177
|
try {
|
|
178
178
|
const provider = this._provider;
|
|
179
|
-
const tx = yield
|
|
180
|
-
|
|
179
|
+
const tx = yield (provider === null || provider === void 0 ? void 0 : provider.generateTransaction(transaction));
|
|
180
|
+
if (tx) {
|
|
181
|
+
yield (provider === null || provider === void 0 ? void 0 : provider.signAndSubmitTransaction(tx.data));
|
|
182
|
+
}
|
|
181
183
|
const promise = yield new Promise((resolve, reject) => {
|
|
182
184
|
this.once('success', resolve);
|
|
183
185
|
this.once('error', reject);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FewchaWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"FewchaWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { MaybeHexString } from 'aptos';
|
|
2
|
+
import { TransactionPayload, SubmitTransactionRequest, PendingTransaction } from 'aptos/dist/generated';
|
|
2
3
|
import { AccountKeys, BaseWalletAdapter, WalletName, WalletReadyState } from './BaseAdapter';
|
|
3
4
|
interface IHippoWallet {
|
|
4
5
|
connect: () => Promise<{
|
|
5
|
-
address:
|
|
6
|
+
address: MaybeHexString;
|
|
7
|
+
publicKey: MaybeHexString;
|
|
8
|
+
authKey: MaybeHexString;
|
|
6
9
|
}>;
|
|
7
10
|
account: () => Promise<string>;
|
|
8
11
|
isConnected: () => Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HippoExtensionWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/HippoExtensionWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM
|
|
1
|
+
{"version":3,"file":"HippoExtensionWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/HippoExtensionWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;AAO9B,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,YAAY;IACpB,OAAO,EAAE,MAAM,OAAO,CAAC;QACrB,OAAO,EAAE,cAAc,CAAC;QACxB,SAAS,EAAE,cAAc,CAAC;QAC1B,OAAO,EAAE,cAAc,CAAC;KACzB,CAAC,CAAC;IACH,OAAO,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,wBAAwB,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IACzD,eAAe,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B;AAQD,eAAO,MAAM,wBAAwB,4BAA+C,CAAC;AAErF,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,2BAA4B,SAAQ,iBAAiB;IAChE,IAAI,6BAA4B;IAEhC,GAAG,SAAgD;IAEnD,IAAI,SAAqF;IAEzF,SAAS,CAAC,SAAS,EAAE,YAAY,GAAG,SAAS,CAAC;IAG9C,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAGJ;IAEnC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAE/B,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;gBAElB,EAGV,OAAe,EAChB,GAAE,iCAAsC;IAqBzC,IAAI,aAAa,IAAI,WAAW,CAM/B;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,UAAU,IAAI,gBAAgB,CAEjC;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAsBnF,wBAAwB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAsB7F"}
|
|
@@ -20,7 +20,7 @@ class HippoExtensionWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
20
20
|
timeout = 10000 } = {}) {
|
|
21
21
|
super();
|
|
22
22
|
this.name = exports.HippoExtensionWalletName;
|
|
23
|
-
this.url = 'https://hippo-wallet
|
|
23
|
+
this.url = 'https://github.com/hippospace/hippo-wallet';
|
|
24
24
|
this.icon = 'https://ui-test1-22e7c.web.app/static/media/hippo_logo.ecded6bf411652de9b7f.png';
|
|
25
25
|
this._readyState = typeof window === 'undefined' || typeof document === 'undefined'
|
|
26
26
|
? BaseAdapter_1.WalletReadyState.Unsupported
|
|
@@ -46,7 +46,7 @@ class HippoExtensionWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
46
46
|
return {
|
|
47
47
|
publicKey: ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.publicKey) || null,
|
|
48
48
|
address: ((_b = this._wallet) === null || _b === void 0 ? void 0 : _b.address) || null,
|
|
49
|
-
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.
|
|
49
|
+
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.authKey) || null
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
52
|
get connecting() {
|
|
@@ -70,10 +70,7 @@ class HippoExtensionWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
70
70
|
this._connecting = true;
|
|
71
71
|
const provider = this._provider || window.hippoWallet;
|
|
72
72
|
const response = yield (provider === null || provider === void 0 ? void 0 : provider.connect());
|
|
73
|
-
this._wallet = {
|
|
74
|
-
publicKey: response === null || response === void 0 ? void 0 : response.address,
|
|
75
|
-
isConnected: true
|
|
76
|
-
};
|
|
73
|
+
this._wallet = Object.assign(Object.assign({}, response), { isConnected: true });
|
|
77
74
|
this.emit('connect', this._wallet.publicKey);
|
|
78
75
|
}
|
|
79
76
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HippoExtensionWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/HippoExtensionWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"HippoExtensionWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/HippoExtensionWallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { MaybeHexString } from 'aptos';
|
|
2
|
-
import {
|
|
2
|
+
import { TransactionPayload, SubmitTransactionRequest, PendingTransaction } from 'aptos/dist/generated';
|
|
3
3
|
import { AccountKeys, BaseWalletAdapter, WalletName, WalletReadyState } from './BaseAdapter';
|
|
4
4
|
export declare const HippoWalletName: WalletName<"Hippo Web Wallet">;
|
|
5
5
|
export interface HippoWalletAdapterConfig {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HippoWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/HippoWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM
|
|
1
|
+
{"version":3,"file":"HippoWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/HippoWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;AAO9B,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAE7F,eAAO,MAAM,eAAe,gCAAuD,CAAC;AAEpF,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,kBAAmB,SAAQ,iBAAiB;IACvD,IAAI,iCAAmB;IAEvB,GAAG,SAAuC;IAE1C,IAAI,SAAqF;IAEzF,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAGxC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAA8B;IAErE,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAE/B,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;gBAElB,EAGV,OAAe,EAChB,GAAE,wBAA6B;IAWhC,IAAI,aAAa,IAAI,WAAW,CAM/B;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,UAAU,IAAI,gBAAgB,CAEjC;IAED,aAAa,MACR,aAAa;QACd,EAAE,EAAE,MAAM,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,CAAC,EAAE;YACR,SAAS,EAAE,cAAc,CAAC;SAC3B,CAAC;QACF,SAAS,CAAC,EAAE;YACV,SAAS,EAAE,cAAc,CAAC;SAC3B,CAAC;QACF,OAAO,CAAC,EAAE;YACR,SAAS,EAAE,cAAc,CAAC;SAC3B,CAAC;QACF,MAAM,CAAC,EAAE;YACP,IAAI,EAAE,cAAc,CAAC;SACtB,CAAC;QACF,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC,KACD,IAAI,CAkBL;IAEI,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3B,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IA2BnF,wBAAwB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA0B5F,OAAO,CAAC,aAAa,CAEnB;CACH"}
|
|
@@ -61,7 +61,7 @@ class HippoWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
61
61
|
return {
|
|
62
62
|
publicKey: ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.publicKey) || null,
|
|
63
63
|
address: ((_b = this._wallet) === null || _b === void 0 ? void 0 : _b.address) || null,
|
|
64
|
-
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.
|
|
64
|
+
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.authKey) || null
|
|
65
65
|
};
|
|
66
66
|
}
|
|
67
67
|
get connecting() {
|
|
@@ -111,7 +111,8 @@ class HippoWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
111
111
|
method: 'signTransaction',
|
|
112
112
|
payload: transaction
|
|
113
113
|
}),
|
|
114
|
-
origin: window.location.origin
|
|
114
|
+
origin: window.location.origin,
|
|
115
|
+
isPopUp: 'true'
|
|
115
116
|
}).toString();
|
|
116
117
|
const popup = window.open(`${aptosConstants_1.WEBWALLET_URL}?${request}`, 'Transaction Confirmation', 'scrollbars=no,resizable=no,status=no,location=no,toolbar=no,menubar=no,width=440,height=700');
|
|
117
118
|
if (!popup)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HippoWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/HippoWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,6DAAyD;AACzD,sDAImC;AACnC,+
|
|
1
|
+
{"version":3,"file":"HippoWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/HippoWallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { MaybeHexString } from 'aptos';
|
|
2
|
-
import {
|
|
2
|
+
import { TransactionPayload, SubmitTransactionRequest, PendingTransaction } from 'aptos/dist/generated';
|
|
3
3
|
import { AccountKeys, BaseWalletAdapter, WalletName, WalletReadyState } from './BaseAdapter';
|
|
4
4
|
interface ConnectMartianAccount {
|
|
5
5
|
address: MaybeHexString;
|
|
@@ -10,13 +10,14 @@ interface ConnectMartianAccount {
|
|
|
10
10
|
interface MartianAccount {
|
|
11
11
|
address: MaybeHexString;
|
|
12
12
|
publicKey: MaybeHexString;
|
|
13
|
-
|
|
13
|
+
authKey: MaybeHexString;
|
|
14
14
|
isConnected: boolean;
|
|
15
15
|
}
|
|
16
16
|
interface IMartianWallet {
|
|
17
17
|
connect: (params?: any) => Promise<ConnectMartianAccount>;
|
|
18
18
|
account(): Promise<MartianAccount>;
|
|
19
19
|
isConnected(): Promise<boolean>;
|
|
20
|
+
generateTransaction(sender: MaybeHexString, payload: any): Promise<any>;
|
|
20
21
|
signAndSubmitTransaction(transaction: any): Promise<string>;
|
|
21
22
|
disconnect(): Promise<void>;
|
|
22
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MartianWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/MartianWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EACL,kBAAkB,
|
|
1
|
+
{"version":3,"file":"MartianWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/MartianWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;AAQ9B,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,qBAAqB;IAC7B,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,cAAc,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,cAAc;IACtB,OAAO,EAAE,cAAc,CAAC;IACxB,SAAS,EAAE,cAAc,CAAC;IAC1B,OAAO,EAAE,cAAc,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;CACtB;AACD,UAAU,cAAc;IACtB,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAC1D,OAAO,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC;IACnC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,mBAAmB,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IACxE,wBAAwB,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE5D,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B;AAQD,eAAO,MAAM,iBAAiB,6BAAiD,CAAC;AAEhF,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,EAAE,cAAc,CAAC;IAE1B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,oBAAqB,SAAQ,iBAAiB;IACzD,IAAI,8BAAqB;IAEzB,GAAG,SAA+F;IAElG,IAAI,SAC4U;IAEhV,SAAS,CAAC,SAAS,EAAE,cAAc,GAAG,SAAS,CAAC;IAGhD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAGJ;IAEnC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAE/B,SAAS,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CAAC;gBAE7B,EAGV,OAAe,EAChB,GAAE,0BAA+B;IAqBlC,IAAI,aAAa,IAAI,WAAW,CAM/B;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,UAAU,IAAI,gBAAgB,CAEjC;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA+CxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B,eAAe,CAAC,eAAe,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAoBvF,wBAAwB,CAAC,eAAe,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAuBjG"}
|
|
@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.MartianWalletAdapter = exports.MartianWalletName = void 0;
|
|
13
|
-
const
|
|
13
|
+
const util_1 = require("../utilities/util");
|
|
14
14
|
const errors_1 = require("../WalletProviders/errors");
|
|
15
15
|
const BaseAdapter_1 = require("./BaseAdapter");
|
|
16
16
|
exports.MartianWalletName = 'MartianWallet';
|
|
@@ -47,7 +47,7 @@ class MartianWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
47
47
|
return {
|
|
48
48
|
publicKey: ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.publicKey) || null,
|
|
49
49
|
address: ((_b = this._wallet) === null || _b === void 0 ? void 0 : _b.address) || null,
|
|
50
|
-
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.
|
|
50
|
+
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.authKey) || null
|
|
51
51
|
};
|
|
52
52
|
}
|
|
53
53
|
get connecting() {
|
|
@@ -74,13 +74,17 @@ class MartianWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
74
74
|
// console.log(3);
|
|
75
75
|
this._connecting = true;
|
|
76
76
|
const provider = window.martian;
|
|
77
|
-
|
|
77
|
+
const isConnected = yield (provider === null || provider === void 0 ? void 0 : provider.isConnected());
|
|
78
|
+
if (isConnected)
|
|
79
|
+
yield (provider === null || provider === void 0 ? void 0 : provider.disconnect());
|
|
80
|
+
// console.log(4, isConnected);
|
|
78
81
|
const response = yield (provider === null || provider === void 0 ? void 0 : provider.connect());
|
|
79
82
|
// console.log(5, response);
|
|
80
83
|
if (!response) {
|
|
81
84
|
throw new errors_1.WalletNotConnectedError('No connect response');
|
|
82
85
|
}
|
|
83
86
|
const walletAccount = yield (provider === null || provider === void 0 ? void 0 : provider.account());
|
|
87
|
+
// console.log(6, walletAccount);
|
|
84
88
|
if (walletAccount) {
|
|
85
89
|
this._wallet = Object.assign(Object.assign({}, walletAccount), { isConnected: true });
|
|
86
90
|
// console.log(6, this._wallet);
|
|
@@ -122,14 +126,15 @@ class MartianWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
122
126
|
const provider = this._provider;
|
|
123
127
|
if (!wallet)
|
|
124
128
|
throw new errors_1.WalletNotConnectedError();
|
|
125
|
-
const tx = yield
|
|
129
|
+
const tx = yield (provider === null || provider === void 0 ? void 0 : provider.generateTransaction(wallet.address || '', transactionPyld));
|
|
130
|
+
if (!tx)
|
|
131
|
+
throw new errors_1.WalletSignTransactionError('No transaction');
|
|
126
132
|
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signAndSubmitTransaction(tx));
|
|
127
133
|
if (!response) {
|
|
128
134
|
throw new errors_1.WalletSignTransactionError('No response');
|
|
129
135
|
}
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
};
|
|
136
|
+
const result = { hash: response };
|
|
137
|
+
return result;
|
|
133
138
|
}
|
|
134
139
|
catch (error) {
|
|
135
140
|
this.emit('error', error);
|
|
@@ -141,10 +146,12 @@ class MartianWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
141
146
|
return __awaiter(this, void 0, void 0, function* () {
|
|
142
147
|
try {
|
|
143
148
|
const wallet = this._wallet;
|
|
144
|
-
const provider = this._provider;
|
|
145
|
-
if (!wallet)
|
|
149
|
+
const provider = this._provider || window.martian;
|
|
150
|
+
if (!wallet || !provider)
|
|
146
151
|
throw new errors_1.WalletNotConnectedError();
|
|
147
|
-
const tx = yield
|
|
152
|
+
const tx = yield provider.generateTransaction(wallet.address.toString() || '', (0, util_1.payloadV1ToV0)(transactionPyld));
|
|
153
|
+
if (!tx)
|
|
154
|
+
throw new errors_1.WalletSignTransactionError('Cannot generate transaction');
|
|
148
155
|
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signAndSubmitTransaction(tx));
|
|
149
156
|
if (!response) {
|
|
150
157
|
throw new errors_1.WalletSignTransactionError('No response');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MartianWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/MartianWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"MartianWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/MartianWallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { TransactionPayload, SubmitTransactionRequest, PendingTransaction } from 'aptos/dist/generated';
|
|
2
2
|
import { AccountKeys, BaseWalletAdapter, PublicKey, WalletName, WalletReadyState } from './BaseAdapter';
|
|
3
3
|
interface IMultiMaskWallet {
|
|
4
4
|
currentProvider: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiMaskWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/MultiMaskWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,
|
|
1
|
+
{"version":3,"file":"MultiMaskWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/MultiMaskWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EAEnB,MAAM,sBAAsB,CAAC;AAO9B,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,SAAS,EAET,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,gBAAgB;IACxB,eAAe,EAAE;QACf,MAAM,EAAE,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;QACnC,SAAS,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAAC;KACtF,CAAC;IACF,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACxC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,sBAAsB,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B;AAQD,eAAO,MAAM,mBAAmB,+BAAqD,CAAC;AAEtF,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAE5B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,sBAAuB,SAAQ,iBAAiB;IAC3D,IAAI,gCAAuB;IAE3B,GAAG,SAAuE;IAE1E,IAAI,SAA6D;IAEjE,SAAS,CAAC,SAAS,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAGlD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAGJ;IAEnC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAE/B,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;gBAElB,EAGV,OAAe,EAChB,GAAE,4BAAiC;IAqBpC,IAAI,aAAa,IAAI,WAAW,CAM/B;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,UAAU,IAAI,gBAAgB,CAEjC;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAqCxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B3B,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IA2BnF,wBAAwB,CAAC,eAAe,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAwCjG"}
|
|
@@ -46,7 +46,7 @@ class MultiMaskWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
46
46
|
return {
|
|
47
47
|
publicKey: ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.publicKey) || null,
|
|
48
48
|
address: ((_b = this._wallet) === null || _b === void 0 ? void 0 : _b.address) || null,
|
|
49
|
-
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.
|
|
49
|
+
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.authKey) || null
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
52
|
get connecting() {
|
|
@@ -165,7 +165,7 @@ class MultiMaskWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
165
165
|
// console.log('trans 2', transaction, transaction.function.split(':')[0]);
|
|
166
166
|
wallet.currentProvider.sendAsync({
|
|
167
167
|
method: 'eth_sendTransaction',
|
|
168
|
-
params: [{ from: transaction.function.split(':')[0] }]
|
|
168
|
+
params: [{ from: transaction.function.name.split(':')[0] }]
|
|
169
169
|
}, (error, resp) => {
|
|
170
170
|
console.log('signTransaction', error, resp);
|
|
171
171
|
if (error) {
|