@manahippo/aptos-wallet-adapter 0.4.6 → 0.4.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/WalletAdapters/NightlyWallet.d.ts +6 -1
- package/dist/WalletAdapters/NightlyWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/NightlyWallet.js +7 -5
- package/dist/WalletAdapters/NightlyWallet.js.map +1 -1
- package/dist/WalletAdapters/PetraWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/PetraWallet.js +0 -5
- package/dist/WalletAdapters/PetraWallet.js.map +1 -1
- package/dist/WalletAdapters/RiseWallet.d.ts +1 -0
- package/dist/WalletAdapters/RiseWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/RiseWallet.js +15 -0
- package/dist/WalletAdapters/RiseWallet.js.map +1 -1
- package/package.json +1 -1
- package/src/WalletAdapters/NightlyWallet.ts +13 -7
- package/src/WalletAdapters/PetraWallet.ts +0 -5
- package/src/WalletAdapters/RiseWallet.ts +18 -0
|
@@ -15,9 +15,14 @@ interface AptosNightly {
|
|
|
15
15
|
constructor(eventMap: Map<string, (data: any) => any>): any;
|
|
16
16
|
connect(onDisconnect?: () => void, eagerConnect?: boolean): Promise<AptosPublicKey>;
|
|
17
17
|
disconnect(): Promise<void>;
|
|
18
|
-
signTransaction: (transaction: TransactionPayload) => Promise<Uint8Array>;
|
|
18
|
+
signTransaction: (transaction: TransactionPayload, submit: boolean) => Promise<Uint8Array | PendingTransaction>;
|
|
19
19
|
signAllTransactions: (transaction: TransactionPayload[]) => Promise<Uint8Array[]>;
|
|
20
20
|
signMessage(msg: string): Promise<Uint8Array>;
|
|
21
|
+
network(): Promise<{
|
|
22
|
+
api: string;
|
|
23
|
+
chainId: number;
|
|
24
|
+
network: string;
|
|
25
|
+
}>;
|
|
21
26
|
}
|
|
22
27
|
export declare const NightlyWalletName: WalletName<"Nightly">;
|
|
23
28
|
export interface NightlyWalletAdapterConfig {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NightlyWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/NightlyWallet.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,YAAW,CAAC;AAEtC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"NightlyWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/NightlyWallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,6 @@ exports.NightlyWalletAdapter = exports.NightlyWalletName = exports.AptosPublicKe
|
|
|
36
36
|
const NightlyWallet = () => { };
|
|
37
37
|
exports.NightlyWallet = NightlyWallet;
|
|
38
38
|
const SHA3 = __importStar(require("js-sha3"));
|
|
39
|
-
const aptosConstants_1 = require("../config/aptosConstants");
|
|
40
39
|
const errors_1 = require("../WalletProviders/errors");
|
|
41
40
|
const BaseAdapter_1 = require("./BaseAdapter");
|
|
42
41
|
class AptosPublicKey {
|
|
@@ -145,6 +144,10 @@ class NightlyWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
145
144
|
isConnected: true
|
|
146
145
|
};
|
|
147
146
|
this.emit('connect', this._wallet.publicKey || '');
|
|
147
|
+
const networkData = yield (provider === null || provider === void 0 ? void 0 : provider.network());
|
|
148
|
+
this._chainId = networkData === null || networkData === void 0 ? void 0 : networkData.chainId.toString();
|
|
149
|
+
this._api = networkData === null || networkData === void 0 ? void 0 : networkData.api;
|
|
150
|
+
this._network = networkData === null || networkData === void 0 ? void 0 : networkData.network.toLocaleLowerCase();
|
|
148
151
|
}
|
|
149
152
|
catch (error) {
|
|
150
153
|
this.emit('error', error);
|
|
@@ -181,7 +184,7 @@ class NightlyWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
181
184
|
throw new errors_1.WalletNotConnectedError();
|
|
182
185
|
try {
|
|
183
186
|
const provider = this._provider || ((_a = window.nightly) === null || _a === void 0 ? void 0 : _a.aptos);
|
|
184
|
-
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signTransaction(payload));
|
|
187
|
+
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signTransaction(payload, false));
|
|
185
188
|
if (response) {
|
|
186
189
|
return response;
|
|
187
190
|
}
|
|
@@ -235,10 +238,9 @@ class NightlyWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
235
238
|
throw new errors_1.WalletNotConnectedError();
|
|
236
239
|
try {
|
|
237
240
|
const provider = this._provider || ((_a = window.nightly) === null || _a === void 0 ? void 0 : _a.aptos);
|
|
238
|
-
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signTransaction(tx));
|
|
239
|
-
const result = yield aptosConstants_1.aptosClient.submitSignedBCSTransaction(response);
|
|
241
|
+
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signTransaction(tx, true));
|
|
240
242
|
if (response) {
|
|
241
|
-
return
|
|
243
|
+
return response;
|
|
242
244
|
}
|
|
243
245
|
else {
|
|
244
246
|
throw new Error('Transaction failed');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NightlyWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/NightlyWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAO,MAAM,aAAa,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;AAAzB,QAAA,aAAa,iBAAY;AAGtC,8CAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"NightlyWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/NightlyWallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PetraWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/PetraWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAY9B,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,WAAW,EAEX,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,iBAAiB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,aAAK,WAAW,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5E,UAAU,YAAY;IACpB,OAAO,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;IACpC,OAAO,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;IACpC,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,wBAAwB,CACtB,WAAW,EAAE,GAAG,EAChB,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC;QAAE,IAAI,EAAE,KAAK,CAAC,eAAe,CAAA;KAAE,GAAG,iBAAiB,CAAC,CAAC;IAChE,eAAe,CAAC,WAAW,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,GAAG,iBAAiB,CAAC,CAAC;IAC1F,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACvE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,OAAO,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACzC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3B,eAAe,EAAE,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,WAAW,KAAK,IAAI,KAAK,IAAI,CAAC;IACvE,eAAe,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,KAAK,IAAI,CAAC;CACjF;AAQD,eAAO,MAAM,eAAe,qBAAiC,CAAC;AAE9D,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,kBAAmB,SAAQ,iBAAiB;IACvD,IAAI,sBAAmB;IAEvB,GAAG,SAC+F;IAElG,IAAI,SAAwE;IAE5E,SAAS,CAAC,SAAS,EAAE,YAAY,GAAG,SAAS,CAAC;IAE9C,SAAS,CAAC,QAAQ,EAAE,oBAAoB,CAAC;IAEzC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC;IAEvB,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,OAAO,IAAI,WAAW,CAMzB;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;
|
|
1
|
+
{"version":3,"file":"PetraWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/PetraWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAY9B,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,WAAW,EAEX,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,iBAAiB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,aAAK,WAAW,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5E,UAAU,YAAY;IACpB,OAAO,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;IACpC,OAAO,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;IACpC,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,wBAAwB,CACtB,WAAW,EAAE,GAAG,EAChB,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC;QAAE,IAAI,EAAE,KAAK,CAAC,eAAe,CAAA;KAAE,GAAG,iBAAiB,CAAC,CAAC;IAChE,eAAe,CAAC,WAAW,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,GAAG,iBAAiB,CAAC,CAAC;IAC1F,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACvE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,OAAO,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACzC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3B,eAAe,EAAE,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,WAAW,KAAK,IAAI,KAAK,IAAI,CAAC;IACvE,eAAe,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,KAAK,IAAI,CAAC;CACjF;AAQD,eAAO,MAAM,eAAe,qBAAiC,CAAC;AAE9D,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,kBAAmB,SAAQ,iBAAiB;IACvD,IAAI,sBAAmB;IAEvB,GAAG,SAC+F;IAElG,IAAI,SAAwE;IAE5E,SAAS,CAAC,SAAS,EAAE,YAAY,GAAG,SAAS,CAAC;IAE9C,SAAS,CAAC,QAAQ,EAAE,oBAAoB,CAAC;IAEzC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC;IAEvB,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,OAAO,IAAI,WAAW,CAMzB;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;IA2CxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B,eAAe,CAAC,WAAW,EAAE,KAAK,CAAC,kBAAkB,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAkB1F,wBAAwB,CAC5B,WAAW,EAAE,KAAK,CAAC,kBAAkB,EACrC,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC;QAAE,IAAI,EAAE,KAAK,CAAC,eAAe,CAAA;KAAE,CAAC;IAkBrC,WAAW,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAqBzE,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBhC,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;CAiBvC"}
|
|
@@ -67,7 +67,6 @@ class AptosWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
67
67
|
return this._readyState;
|
|
68
68
|
}
|
|
69
69
|
connect() {
|
|
70
|
-
var _a;
|
|
71
70
|
return __awaiter(this, void 0, void 0, function* () {
|
|
72
71
|
try {
|
|
73
72
|
if (this.connected || this.connecting)
|
|
@@ -77,10 +76,6 @@ class AptosWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
77
76
|
throw new errors_1.WalletNotReadyError();
|
|
78
77
|
this._connecting = true;
|
|
79
78
|
const provider = this._provider || window.aptos;
|
|
80
|
-
const isConnected = yield ((_a = this._provider) === null || _a === void 0 ? void 0 : _a.isConnected());
|
|
81
|
-
if (isConnected === true) {
|
|
82
|
-
yield (provider === null || provider === void 0 ? void 0 : provider.disconnect());
|
|
83
|
-
}
|
|
84
79
|
const response = yield (provider === null || provider === void 0 ? void 0 : provider.connect());
|
|
85
80
|
this._wallet = {
|
|
86
81
|
address: response === null || response === void 0 ? void 0 : response.address,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PetraWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/PetraWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,sDAUmC;AACnC,+CAUuB;AAiCV,QAAA,eAAe,GAAG,OAA8B,CAAC;AAQ9D,MAAa,kBAAmB,SAAQ,+BAAiB;IA2BvD,YAAY;IACV,YAAY;IACZ,0CAA0C;IAC1C,OAAO,GAAG,KAAK,KACa,EAAE;QAC9B,KAAK,EAAE,CAAC;QA/BV,SAAI,GAAG,uBAAe,CAAC;QAEvB,QAAG,GACD,+FAA+F,CAAC;QAElG,SAAI,GAAG,oEAAoE,CAAC;QAYlE,gBAAW,GACnB,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,QAAQ,KAAK,WAAW;YAC9D,CAAC,CAAC,8BAAgB,CAAC,WAAW;YAC9B,CAAC,CAAC,8BAAgB,CAAC,WAAW,CAAC;QAajC,IAAI,CAAC,SAAS,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1E,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,IAAI,CAAC,WAAW,KAAK,8BAAgB,CAAC,WAAW,EAAE;YACtF,IAAA,2CAA6B,EAAC,GAAG,EAAE;gBACjC,IAAI,MAAM,CAAC,KAAK,EAAE;oBAChB,IAAI,CAAC,WAAW,GAAG,8BAAgB,CAAC,SAAS,CAAC;oBAC9C,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;oBAChD,OAAO,IAAI,CAAC;iBACb;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAED,IAAI,aAAa;;QACf,OAAO;YACL,SAAS,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,SAAS,KAAI,IAAI;YAC1C,OAAO,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,KAAI,IAAI;YACtC,OAAO,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,KAAI,IAAI;SACvC,CAAC;IACJ,CAAC;IAED,IAAI,OAAO;QACT,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,QAAQ;YACnB,GAAG,EAAE,IAAI,CAAC,IAAI;YACd,OAAO,EAAE,IAAI,CAAC,QAAQ;SACvB,CAAC;IACJ,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,IAAI,SAAS;;QACX,OAAO,CAAC,CAAC,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,WAAW,CAAA,CAAC;IACrC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAEK,OAAO
|
|
1
|
+
{"version":3,"file":"PetraWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/PetraWallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@ interface IRiseWallet {
|
|
|
18
18
|
signTransaction(transaction: any, options?: any): Promise<Uint8Array>;
|
|
19
19
|
signMessage(message: SignMessagePayload): Promise<SignMessageResponse>;
|
|
20
20
|
disconnect(): Promise<void>;
|
|
21
|
+
network(): Promise<NetworkInfo>;
|
|
21
22
|
}
|
|
22
23
|
export declare const RiseWalletName: WalletName<"Rise Wallet">;
|
|
23
24
|
export interface RiseWalletAdapterConfig {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RiseWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/RiseWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"RiseWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/RiseWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAW9C,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,WAAW,EAEX,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,WAAW;IACnB,OAAO,EAAE,cAAc,CAAC;IACxB,SAAS,EAAE,cAAc,CAAC;IAC1B,OAAO,EAAE,cAAc,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5C,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC;IAChC,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,wBAAwB,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,KAAK,CAAC,eAAe,CAAA;KAAE,CAAC,CAAC;IACrF,eAAe,CAAC,WAAW,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACtE,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACvE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC;CACjC;AAQD,eAAO,MAAM,cAAc,2BAA6C,CAAC;AAEzE,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,EAAE,WAAW,CAAC;IAEvB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,iBAAkB,SAAQ,iBAAiB;IACtD,IAAI,4BAAkB;IAEtB,GAAG,SAAgF;IAEnF,IAAI,SAA2C;IAE/C,SAAS,CAAC,SAAS,EAAE,WAAW,GAAG,SAAS,CAAC;IAE7C,SAAS,CAAC,QAAQ,EAAE,oBAAoB,CAAC;IAEzC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC;IAEvB,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,uBAA4B;IAqB/B,IAAI,aAAa,IAAI,WAAW,CAM/B;IAED,IAAI,OAAO,IAAI,WAAW,CAMzB;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;IA6DxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B,eAAe,CAAC,WAAW,EAAE,KAAK,CAAC,kBAAkB,GAAG,OAAO,CAAC,UAAU,CAAC;IAmB3E,wBAAwB,CAC5B,WAAW,EAAE,KAAK,CAAC,kBAAkB,GACpC,OAAO,CAAC;QAAE,IAAI,EAAE,KAAK,CAAC,eAAe,CAAA;KAAE,CAAC;IAmBrC,WAAW,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAqBzE,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAahC,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;CAYvC"}
|
|
@@ -85,6 +85,21 @@ class RiseWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
85
85
|
if (!response) {
|
|
86
86
|
throw new WalletProviders_1.WalletNotConnectedError('User has rejected the request');
|
|
87
87
|
}
|
|
88
|
+
// TODO - remove this check in the future
|
|
89
|
+
// provider.network is still not live and we want smooth transition
|
|
90
|
+
if (provider === null || provider === void 0 ? void 0 : provider.network) {
|
|
91
|
+
try {
|
|
92
|
+
const { chainId, api, name } = yield provider.network();
|
|
93
|
+
this._network = name;
|
|
94
|
+
this._chainId = chainId;
|
|
95
|
+
this._api = api;
|
|
96
|
+
}
|
|
97
|
+
catch (error) {
|
|
98
|
+
const errMsg = error.message;
|
|
99
|
+
this.emit('error', new WalletProviders_1.WalletGetNetworkError(errMsg));
|
|
100
|
+
throw error;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
88
103
|
const account = yield (provider === null || provider === void 0 ? void 0 : provider.account());
|
|
89
104
|
if (account) {
|
|
90
105
|
const { publicKey, address, authKey } = account;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RiseWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/RiseWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"RiseWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/RiseWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,wDAS4B;AAC5B,+CAUuB;AA0BV,QAAA,cAAc,GAAG,aAA0C,CAAC;AAQzE,MAAa,iBAAkB,SAAQ,+BAAiB;IA0BtD,YAAY;IACV,YAAY;IACZ,0CAA0C;IAC1C,OAAO,GAAG,KAAK,KACY,EAAE;QAC7B,KAAK,EAAE,CAAC;QA9BV,SAAI,GAAG,sBAAc,CAAC;QAEtB,QAAG,GAAG,4EAA4E,CAAC;QAEnF,SAAI,GAAG,uCAAuC,CAAC;QAYrC,gBAAW,GACnB,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,QAAQ,KAAK,WAAW;YAC9D,CAAC,CAAC,8BAAgB,CAAC,WAAW;YAC9B,CAAC,CAAC,8BAAgB,CAAC,WAAW,CAAC;QAajC,IAAI,CAAC,SAAS,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QACzE,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,IAAI,CAAC,WAAW,KAAK,8BAAgB,CAAC,WAAW,EAAE;YACtF,IAAA,2CAA6B,EAAC,GAAG,EAAE;gBACjC,IAAI,MAAM,CAAC,IAAI,EAAE;oBACf,IAAI,CAAC,WAAW,GAAG,8BAAgB,CAAC,SAAS,CAAC;oBAC9C,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;oBAChD,OAAO,IAAI,CAAC;iBACb;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAED,IAAI,aAAa;;QACf,OAAO;YACL,SAAS,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,SAAS,KAAI,IAAI;YAC1C,OAAO,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,KAAI,IAAI;YACtC,OAAO,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,KAAI,IAAI;SACvC,CAAC;IACJ,CAAC;IAED,IAAI,OAAO;QACT,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,QAAQ;YACnB,GAAG,EAAE,IAAI,CAAC,IAAI;YACd,OAAO,EAAE,IAAI,CAAC,QAAQ;SACvB,CAAC;IACJ,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,IAAI,SAAS;;QACX,OAAO,CAAC,CAAC,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,WAAW,CAAA,CAAC;IACrC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAEK,OAAO;;;YACX,IAAI;gBACF,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU;oBAAE,OAAO;gBAC9C,IACE,CAAC,CACC,IAAI,CAAC,WAAW,KAAK,8BAAgB,CAAC,QAAQ;oBAC9C,IAAI,CAAC,WAAW,KAAK,8BAAgB,CAAC,SAAS,CAChD;oBAED,MAAM,IAAI,qCAAmB,EAAE,CAAC;gBAClC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;gBAExB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC;gBAC/C,MAAM,WAAW,GAAG,MAAM,CAAA,MAAA,IAAI,CAAC,SAAS,0CAAE,WAAW,EAAE,CAAA,CAAC;gBACxD,IAAI,WAAW,KAAK,IAAI,EAAE;oBACxB,MAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,UAAU,EAAE,CAAA,CAAC;iBAC9B;gBAED,MAAM,QAAQ,GAAG,MAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,EAAE,CAAA,CAAC;gBAE3C,IAAI,CAAC,QAAQ,EAAE;oBACb,MAAM,IAAI,yCAAuB,CAAC,+BAA+B,CAAC,CAAC;iBACpE;gBAED,yCAAyC;gBACzC,oEAAoE;gBACpE,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,EAAE;oBACrB,IAAI;wBACF,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;wBAExD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;wBACrB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;wBACxB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;qBACjB;oBAAC,OAAO,KAAU,EAAE;wBACnB,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC;wBAC7B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,uCAAqB,CAAC,MAAM,CAAC,CAAC,CAAC;wBACtD,MAAM,KAAK,CAAC;qBACb;iBACF;gBAED,MAAM,OAAO,GAAG,MAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,EAAE,CAAA,CAAC;gBAC1C,IAAI,OAAO,EAAE;oBACX,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;oBAEhD,IAAI,CAAC,OAAO,GAAG;wBACb,SAAS;wBACT,OAAO;wBACP,OAAO;wBACP,WAAW,EAAE,IAAI;qBAClB,CAAC;oBAEF,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;iBAC9C;aACF;YAAC,OAAO,KAAU,EAAE;gBACnB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBAC1B,MAAM,KAAK,CAAC;aACb;oBAAS;gBACR,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;aAC1B;;KACF;IAEK,UAAU;;YACd,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;YAC5B,IAAI,MAAM,EAAE;gBACV,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;gBAEpB,IAAI;oBACF,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC;oBAC/C,MAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,UAAU,EAAE,CAAA,CAAC;iBAC9B;gBAAC,OAAO,KAAU,EAAE;oBACnB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,0CAAwB,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;iBACzE;aACF;YAED,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC1B,CAAC;KAAA;IAEK,eAAe,CAAC,WAAqC;;YACzD,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;gBAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC;gBAC/C,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ;oBAAE,MAAM,IAAI,yCAAuB,EAAE,CAAC;gBAE9D,MAAM,QAAQ,GAAG,MAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,eAAe,CAAC,WAAW,CAAC,CAAA,CAAC;gBAC9D,IAAI,QAAQ,EAAE;oBACZ,OAAO,QAAQ,CAAC;iBACjB;qBAAM;oBACL,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;iBAC5C;aACF;YAAC,OAAO,KAAU,EAAE;gBACnB,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC;gBAC7B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,4CAA0B,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC3D,MAAM,KAAK,CAAC;aACb;QACH,CAAC;KAAA;IAEK,wBAAwB,CAC5B,WAAqC;;YAErC,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;gBAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC;gBAC/C,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ;oBAAE,MAAM,IAAI,yCAAuB,EAAE,CAAC;gBAE9D,MAAM,QAAQ,GAAG,MAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,wBAAwB,CAAC,WAAW,CAAC,CAAA,CAAC;gBACvE,IAAI,QAAQ,EAAE;oBACZ,OAAO,QAAQ,CAAC;iBACjB;qBAAM;oBACL,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;iBACvC;aACF;YAAC,OAAO,KAAU,EAAE;gBACnB,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC;gBAC7B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,4CAA0B,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC3D,MAAM,KAAK,CAAC;aACb;QACH,CAAC;KAAA;IAEK,WAAW,CAAC,UAA8B;;YAC9C,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;gBAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC;gBAC/C,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ;oBAAE,MAAM,IAAI,yCAAuB,EAAE,CAAC;gBAC9D,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE;oBACvD,MAAM,IAAI,wCAAsB,CAAC,6BAA6B,CAAC,CAAC;iBACjE;gBACD,MAAM,QAAQ,GAAG,MAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,WAAW,CAAC,UAAU,CAAC,CAAA,CAAC;gBACzD,IAAI,QAAQ,EAAE;oBACZ,OAAO,QAAQ,CAAC;iBACjB;qBAAM;oBACL,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;iBACxC;aACF;YAAC,OAAO,KAAU,EAAE;gBACnB,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC;gBAC7B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,wCAAsB,CAAC,MAAM,CAAC,CAAC,CAAC;gBACvD,MAAM,KAAK,CAAC;aACb;QACH,CAAC;KAAA;IAEK,eAAe;;YACnB,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;gBAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC;gBAC/C,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ;oBAAE,MAAM,IAAI,yCAAuB,EAAE,CAAC;gBAC9D,mBAAmB;aACpB;YAAC,OAAO,KAAU,EAAE;gBACnB,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC;gBAC7B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,0CAAwB,CAAC,MAAM,CAAC,CAAC,CAAC;gBACzD,MAAM,KAAK,CAAC;aACb;QACH,CAAC;KAAA;IAEK,eAAe;;YACnB,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;gBAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC;gBAC/C,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ;oBAAE,MAAM,IAAI,yCAAuB,EAAE,CAAC;gBAC9D,mBAAmB;aACpB;YAAC,OAAO,KAAU,EAAE;gBACnB,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC;gBAC7B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,0CAAwB,CAAC,MAAM,CAAC,CAAC,CAAC;gBACzD,MAAM,KAAK,CAAC;aACb;QACH,CAAC;KAAA;CACF;AAlPD,8CAkPC"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,6 @@ export const NightlyWallet = () => {};
|
|
|
2
2
|
|
|
3
3
|
import { PendingTransaction, TransactionPayload } from 'aptos/src/generated';
|
|
4
4
|
import * as SHA3 from 'js-sha3';
|
|
5
|
-
import { aptosClient } from '../config/aptosConstants';
|
|
6
5
|
import {
|
|
7
6
|
WalletAccountChangeError,
|
|
8
7
|
WalletDisconnectionError,
|
|
@@ -61,9 +60,13 @@ interface AptosNightly {
|
|
|
61
60
|
constructor(eventMap: Map<string, (data: any) => any>);
|
|
62
61
|
connect(onDisconnect?: () => void, eagerConnect?: boolean): Promise<AptosPublicKey>;
|
|
63
62
|
disconnect(): Promise<void>;
|
|
64
|
-
signTransaction: (
|
|
63
|
+
signTransaction: (
|
|
64
|
+
transaction: TransactionPayload,
|
|
65
|
+
submit: boolean
|
|
66
|
+
) => Promise<Uint8Array | PendingTransaction>;
|
|
65
67
|
signAllTransactions: (transaction: TransactionPayload[]) => Promise<Uint8Array[]>;
|
|
66
68
|
signMessage(msg: string): Promise<Uint8Array>;
|
|
69
|
+
network(): Promise<{ api: string; chainId: number; network: string }>;
|
|
67
70
|
}
|
|
68
71
|
interface NightlyWindow extends Window {
|
|
69
72
|
nightly?: {
|
|
@@ -191,6 +194,10 @@ export class NightlyWalletAdapter extends BaseWalletAdapter {
|
|
|
191
194
|
};
|
|
192
195
|
|
|
193
196
|
this.emit('connect', this._wallet.publicKey || '');
|
|
197
|
+
const networkData = await provider?.network();
|
|
198
|
+
this._chainId = networkData?.chainId.toString();
|
|
199
|
+
this._api = networkData?.api;
|
|
200
|
+
this._network = networkData?.network.toLocaleLowerCase() as WalletAdapterNetwork;
|
|
194
201
|
} catch (error: any) {
|
|
195
202
|
this.emit('error', error);
|
|
196
203
|
throw error;
|
|
@@ -222,9 +229,9 @@ export class NightlyWalletAdapter extends BaseWalletAdapter {
|
|
|
222
229
|
|
|
223
230
|
try {
|
|
224
231
|
const provider = this._provider || window.nightly?.aptos;
|
|
225
|
-
const response = await provider?.signTransaction(payload);
|
|
232
|
+
const response = await provider?.signTransaction(payload, false);
|
|
226
233
|
if (response) {
|
|
227
|
-
return response;
|
|
234
|
+
return response as Uint8Array;
|
|
228
235
|
} else {
|
|
229
236
|
throw new Error('Transaction failed');
|
|
230
237
|
}
|
|
@@ -266,10 +273,9 @@ export class NightlyWalletAdapter extends BaseWalletAdapter {
|
|
|
266
273
|
|
|
267
274
|
try {
|
|
268
275
|
const provider = this._provider || window.nightly?.aptos;
|
|
269
|
-
const response = await provider?.signTransaction(tx);
|
|
270
|
-
const result = await aptosClient.submitSignedBCSTransaction(response);
|
|
276
|
+
const response = await provider?.signTransaction(tx, true);
|
|
271
277
|
if (response) {
|
|
272
|
-
return
|
|
278
|
+
return response as PendingTransaction;
|
|
273
279
|
} else {
|
|
274
280
|
throw new Error('Transaction failed');
|
|
275
281
|
}
|
|
@@ -154,11 +154,6 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
|
|
|
154
154
|
this._connecting = true;
|
|
155
155
|
|
|
156
156
|
const provider = this._provider || window.aptos;
|
|
157
|
-
const isConnected = await this._provider?.isConnected();
|
|
158
|
-
if (isConnected === true) {
|
|
159
|
-
await provider?.disconnect();
|
|
160
|
-
}
|
|
161
|
-
|
|
162
157
|
const response = await provider?.connect();
|
|
163
158
|
this._wallet = {
|
|
164
159
|
address: response?.address,
|
|
@@ -2,6 +2,7 @@ import { MaybeHexString, Types } from 'aptos';
|
|
|
2
2
|
import {
|
|
3
3
|
WalletAccountChangeError,
|
|
4
4
|
WalletDisconnectionError,
|
|
5
|
+
WalletGetNetworkError,
|
|
5
6
|
WalletNetworkChangeError,
|
|
6
7
|
WalletNotConnectedError,
|
|
7
8
|
WalletNotReadyError,
|
|
@@ -35,6 +36,7 @@ interface IRiseWallet {
|
|
|
35
36
|
signTransaction(transaction: any, options?: any): Promise<Uint8Array>;
|
|
36
37
|
signMessage(message: SignMessagePayload): Promise<SignMessageResponse>;
|
|
37
38
|
disconnect(): Promise<void>;
|
|
39
|
+
network(): Promise<NetworkInfo>;
|
|
38
40
|
}
|
|
39
41
|
|
|
40
42
|
interface RiseWindow extends Window {
|
|
@@ -154,6 +156,22 @@ export class RiseWalletAdapter extends BaseWalletAdapter {
|
|
|
154
156
|
throw new WalletNotConnectedError('User has rejected the request');
|
|
155
157
|
}
|
|
156
158
|
|
|
159
|
+
// TODO - remove this check in the future
|
|
160
|
+
// provider.network is still not live and we want smooth transition
|
|
161
|
+
if (provider?.network) {
|
|
162
|
+
try {
|
|
163
|
+
const { chainId, api, name } = await provider.network();
|
|
164
|
+
|
|
165
|
+
this._network = name;
|
|
166
|
+
this._chainId = chainId;
|
|
167
|
+
this._api = api;
|
|
168
|
+
} catch (error: any) {
|
|
169
|
+
const errMsg = error.message;
|
|
170
|
+
this.emit('error', new WalletGetNetworkError(errMsg));
|
|
171
|
+
throw error;
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
|
|
157
175
|
const account = await provider?.account();
|
|
158
176
|
if (account) {
|
|
159
177
|
const { publicKey, address, authKey } = account;
|