@dynamic-labs/multi-wallet 0.16.0-RC.12 → 0.16.0-RC.14

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.
Files changed (47) hide show
  1. package/CHANGELOG.md +35 -0
  2. package/package.json +7 -7
  3. package/src/index.d.ts +1 -1
  4. package/src/index.js +1 -1
  5. package/src/index.js.map +1 -1
  6. package/src/utils/convertors.js +1 -1
  7. package/src/utils/convertors.js.map +1 -1
  8. package/src/wallets/clients/walletConnect/walletConnect.d.ts +7 -3
  9. package/src/wallets/clients/walletConnect/walletConnect.js +59 -33
  10. package/src/wallets/clients/walletConnect/walletConnect.js.map +1 -1
  11. package/src/wallets/constants.d.ts +2 -2
  12. package/src/wallets/constants.js +3 -3
  13. package/src/wallets/constants.js.map +1 -1
  14. package/src/wallets/cosmos/keplrWalletConnect.d.ts +47 -2
  15. package/src/wallets/cosmos/keplrWalletConnect.js +202 -3
  16. package/src/wallets/cosmos/keplrWalletConnect.js.map +1 -1
  17. package/src/wallets/ethereum/MagicConnector/EmailMagicWalletConnector/EmailMagicWalletConnector.js +2 -2
  18. package/src/wallets/ethereum/MagicConnector/EmailMagicWalletConnector/EmailMagicWalletConnector.js.map +1 -1
  19. package/src/wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.js +1 -1
  20. package/src/wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.js.map +1 -1
  21. package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.d.ts +24 -0
  22. package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.js +94 -0
  23. package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.js.map +1 -0
  24. package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/index.d.ts +2 -0
  25. package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/index.js +6 -0
  26. package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/index.js.map +1 -0
  27. package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.d.ts +7 -13
  28. package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.js +26 -45
  29. package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.js.map +1 -1
  30. package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/index.d.ts +1 -1
  31. package/src/wallets/ethereum/MagicConnector/index.d.ts +1 -0
  32. package/src/wallets/ethereum/MagicConnector/index.js +1 -0
  33. package/src/wallets/ethereum/MagicConnector/index.js.map +1 -1
  34. package/src/wallets/starknet/argentx.js +1 -1
  35. package/src/wallets/starknet/argentx.js.map +1 -1
  36. package/src/wallets/starknet/braavos.js +1 -1
  37. package/src/wallets/starknet/braavos.js.map +1 -1
  38. package/src/wallets/starknet/starknetProvider.d.ts +22 -10
  39. package/src/wallets/starknet/starknetProvider.js +121 -23
  40. package/src/wallets/starknet/starknetProvider.js.map +1 -1
  41. package/src/wallets/walletConnect/walletConnect.d.ts +1 -0
  42. package/src/wallets/walletConnect/walletConnect.js +2 -2
  43. package/src/wallets/walletConnect/walletConnect.js.map +1 -1
  44. package/src/wallets/window.d.ts +1 -0
  45. package/src/wallets/starknet/starknetProviderHelper.d.ts +0 -17
  46. package/src/wallets/starknet/starknetProviderHelper.js +0 -159
  47. package/src/wallets/starknet/starknetProviderHelper.js.map +0 -1
@@ -2,35 +2,48 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const tslib_1 = require("tslib");
4
4
  const get_starknet_1 = require("get-starknet");
5
+ const starknet_1 = require("starknet");
6
+ const constants_1 = require("starknet/constants");
7
+ const uint256_1 = require("starknet/dist/utils/uint256");
5
8
  const errors_1 = require("../../errors");
6
9
  const normalizeWalletName_1 = require("../../utils/normalizeWalletName");
7
- const starknetProviderHelper_1 = require("./starknetProviderHelper");
8
- class StarknetProvider extends starknetProviderHelper_1.StarknetProviderHelper {
9
- constructor(name) {
10
- super();
10
+ const logger_1 = require("../../utils/logger");
11
+ const convertors_1 = require("../../utils/convertors");
12
+ const constants_2 = require("../constants");
13
+ const ethereumContractAbi_json_1 = tslib_1.__importDefault(require("./ethereumContractAbi.json"));
14
+ const ACCOUNT_CHANGED_EVENT_LISTENER = 'accountsChanged';
15
+ const NETWORK_CHANGED_EVENT_LISTENER = 'networkChanged';
16
+ class StarknetProvider {
17
+ constructor(name, windowKey) {
11
18
  this.connectedChain = 'STARK';
12
19
  this.supportedChains = ['STARK'];
13
20
  this.canConnectViaQrCode = false;
14
21
  this.canConnectViaCustodialService = false;
15
22
  this.isWalletConnect = false;
16
- this.starknetProviderHelper = new starknetProviderHelper_1.StarknetProviderHelper();
17
23
  this.name = name;
18
- }
19
- getDeepLink() {
20
- return undefined;
24
+ this.windowKey = windowKey;
21
25
  }
22
26
  get key() {
23
27
  return (0, normalizeWalletName_1.normalizeWalletName)(this.name);
24
28
  }
25
29
  connect() {
26
30
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
27
- yield this.starknetProviderHelper.connectWithName(this.name);
31
+ const wallet = yield this.getWallet();
32
+ try {
33
+ if (wallet && !wallet.isConnected) {
34
+ yield wallet.enable({ showModal: false });
35
+ }
36
+ }
37
+ catch (err) {
38
+ logger_1.logger.error(err);
39
+ }
28
40
  });
29
41
  }
30
42
  fetchPublicAddress() {
31
43
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
32
- const address = yield this.starknetProviderHelper.getPublicAddressWithName(this.name);
33
- return address;
44
+ const wallet = yield this.getWallet();
45
+ yield this.connect();
46
+ return Promise.resolve(wallet === null || wallet === void 0 ? void 0 : wallet.selectedAddress);
34
47
  });
35
48
  }
36
49
  getNetwork() {
@@ -40,12 +53,24 @@ class StarknetProvider extends starknetProviderHelper_1.StarknetProviderHelper {
40
53
  }
41
54
  getSigner() {
42
55
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
43
- const account = yield this.starknetProviderHelper.getConnectedAccountWithName(this.name);
44
- return account === null || account === void 0 ? void 0 : account.signer;
56
+ const wallet = yield this.getWallet();
57
+ return wallet === null || wallet === void 0 ? void 0 : wallet.account;
58
+ });
59
+ }
60
+ getWallet() {
61
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
62
+ if (!this.wallet) {
63
+ const providers = yield (0, get_starknet_1.getInstalledWallets)();
64
+ this.wallet = providers.find((provider) => provider.name === this.name);
65
+ }
66
+ return this.wallet;
45
67
  });
46
68
  }
47
69
  getWeb3Provider() {
48
- return;
70
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
71
+ const wallet = yield this.getWallet();
72
+ return wallet === null || wallet === void 0 ? void 0 : wallet.provider;
73
+ });
49
74
  }
50
75
  getRpcProvider() {
51
76
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -54,7 +79,16 @@ class StarknetProvider extends starknetProviderHelper_1.StarknetProviderHelper {
54
79
  }
55
80
  signMessage(messageToSign) {
56
81
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
57
- const signature = yield this.starknetProviderHelper._signMessage(this.name, messageToSign);
82
+ const wallet = yield this.getWallet();
83
+ const walletAddress = yield this.fetchPublicAddress();
84
+ if (!walletAddress || !wallet) {
85
+ logger_1.logger.error('Could not fetch wallet address for signing message');
86
+ return undefined;
87
+ }
88
+ const { account } = wallet;
89
+ const chainId = account.chainId === constants_1.StarknetChainId.TESTNET ? 'SN_GOERLI' : 'SN_MAIN';
90
+ const encodedMessage = (0, convertors_1.formatTypedDataMessage)(messageToSign, chainId);
91
+ const signature = yield (account === null || account === void 0 ? void 0 : account.signMessage(encodedMessage));
58
92
  return signature === null || signature === void 0 ? void 0 : signature.join(',');
59
93
  });
60
94
  }
@@ -65,7 +99,25 @@ class StarknetProvider extends starknetProviderHelper_1.StarknetProviderHelper {
65
99
  }
66
100
  getBalance() {
67
101
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
68
- return this.starknetProviderHelper._getBalance(this.name);
102
+ const walletAddress = yield this.fetchPublicAddress();
103
+ const provider = yield this.getWeb3Provider();
104
+ if (!walletAddress || !provider) {
105
+ logger_1.logger.error('Could not fetch wallet address for getting balance');
106
+ return undefined;
107
+ }
108
+ const contract = new starknet_1.Contract(ethereumContractAbi_json_1.default, constants_2.ETH_STARKNET_ADDRESS, provider);
109
+ try {
110
+ const { balance } = yield contract.balanceOf(walletAddress);
111
+ const gweiBalance = parseInt((0, uint256_1.uint256ToBN)(balance).toString(10));
112
+ /**
113
+ * Dividing by 1e18 as the returned balance is a Gwei number.
114
+ * Read more here: https://www.investopedia.com/terms/g/gwei-ethereum.asp#toc-what-is-gwei
115
+ */
116
+ return (gweiBalance / 1e18).toFixed(6);
117
+ }
118
+ catch (error) {
119
+ throw new errors_1.DynamicError('Something went wrong');
120
+ }
69
121
  });
70
122
  }
71
123
  endSession() {
@@ -75,8 +127,19 @@ class StarknetProvider extends starknetProviderHelper_1.StarknetProviderHelper {
75
127
  });
76
128
  });
77
129
  }
130
+ getStarknetWindowObject() {
131
+ const starknetWindowInstance = window[`starknet_${this.windowKey}`] || window['starknet'];
132
+ if ((starknetWindowInstance === null || starknetWindowInstance === void 0 ? void 0 : starknetWindowInstance.name) === this.name) {
133
+ return starknetWindowInstance;
134
+ }
135
+ else {
136
+ return undefined;
137
+ }
138
+ }
78
139
  isInstalledOnBrowser() {
79
- return this.starknetProviderHelper.isInstalledHelper(this.name);
140
+ var _a;
141
+ const starknetWindowInstance = (_a = window[`starknet_${this.windowKey}`]) !== null && _a !== void 0 ? _a : window['starknet'];
142
+ return (starknetWindowInstance === null || starknetWindowInstance === void 0 ? void 0 : starknetWindowInstance.name) === this.name;
80
143
  }
81
144
  supportsNetworkSwitching() {
82
145
  return false;
@@ -84,18 +147,53 @@ class StarknetProvider extends starknetProviderHelper_1.StarknetProviderHelper {
84
147
  switchNetwork() {
85
148
  throw new errors_1.DynamicError('switchNetwork - Not supported');
86
149
  }
150
+ getConnectedAccounts() {
151
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
152
+ const wallet = yield this.getWallet();
153
+ return wallet ? [wallet.account.address] : [];
154
+ });
155
+ }
87
156
  setupEventListeners(listeners) {
88
- this.starknetProviderHelper._setupEventListeners(listeners, this.name);
157
+ const wallet = this.getStarknetWindowObject();
158
+ this.handleAccountChange = (address) => tslib_1.__awaiter(this, void 0, void 0, function* () {
159
+ var _a, _b;
160
+ if (!address) {
161
+ yield ((_a = listeners.onDisconnect) === null || _a === void 0 ? void 0 : _a.call(listeners));
162
+ return;
163
+ }
164
+ if (address.toString()) {
165
+ yield ((_b = listeners.onAccountChange) === null || _b === void 0 ? void 0 : _b.call(listeners, [address.toString()]));
166
+ }
167
+ });
168
+ this.handleNetworkChange = (network) => tslib_1.__awaiter(this, void 0, void 0, function* () {
169
+ var _c, _d;
170
+ if (!network) {
171
+ yield ((_c = listeners.onDisconnect) === null || _c === void 0 ? void 0 : _c.call(listeners));
172
+ return;
173
+ }
174
+ if (network.toString()) {
175
+ yield ((_d = listeners.onChainChange) === null || _d === void 0 ? void 0 : _d.call(listeners, network.toString()));
176
+ }
177
+ });
178
+ wallet === null || wallet === void 0 ? void 0 : wallet.on(ACCOUNT_CHANGED_EVENT_LISTENER, this.handleAccountChange);
179
+ wallet === null || wallet === void 0 ? void 0 : wallet.on(NETWORK_CHANGED_EVENT_LISTENER, this.handleNetworkChange);
89
180
  }
90
181
  teardownEventListeners() {
91
- this.starknetProviderHelper._teardownEventListeners(this.name);
92
- }
93
- getConnectedAccounts() {
94
182
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
95
- const account = yield this.starknetProviderHelper.getConnectedAccountWithName(this.name);
96
- return (account === null || account === void 0 ? void 0 : account.address) ? [account === null || account === void 0 ? void 0 : account.address] : [];
183
+ const wallet = yield this.getWallet();
184
+ if (this.handleAccountChange) {
185
+ wallet === null || wallet === void 0 ? void 0 : wallet.off(ACCOUNT_CHANGED_EVENT_LISTENER, this.handleAccountChange);
186
+ this.handleAccountChange = undefined;
187
+ }
188
+ if (this.handleNetworkChange) {
189
+ wallet === null || wallet === void 0 ? void 0 : wallet.off(NETWORK_CHANGED_EVENT_LISTENER, this.handleNetworkChange);
190
+ this.handleNetworkChange = undefined;
191
+ }
97
192
  });
98
193
  }
194
+ getDeepLink() {
195
+ return undefined;
196
+ }
99
197
  }
100
198
  exports.default = StarknetProvider;
101
199
  //# sourceMappingURL=starknetProvider.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"starknetProvider.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/starknet/starknetProvider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"starknetProvider.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/starknet/starknetProvider.ts"],"names":[],"mappings":"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"}
@@ -12,6 +12,7 @@ declare class WalletConnect extends EthProvider implements WalletConnector {
12
12
  isWalletConnect: boolean;
13
13
  switchNetworkOnlyFromWallet: boolean;
14
14
  client?: Client;
15
+ clientOptions?: any;
15
16
  constructor({ walletName, evmNetworks, }: {
16
17
  evmNetworks: EvmNetwork[];
17
18
  walletName: string;
@@ -28,7 +28,7 @@ class WalletConnect extends ethProvider_1.EthProvider {
28
28
  if (this.client) {
29
29
  return this.client;
30
30
  }
31
- this.client = (0, walletConnect_1.initClient)((0, normalizeWalletName_1.normalizeWalletName)(this.name));
31
+ this.client = (0, walletConnect_1.initClient)((0, normalizeWalletName_1.normalizeWalletName)(this.name), this.clientOptions);
32
32
  return this.client;
33
33
  }
34
34
  supportsNetworkSwitching() {
@@ -70,7 +70,7 @@ class WalletConnect extends ethProvider_1.EthProvider {
70
70
  }
71
71
  fetchPublicAddress(opts) {
72
72
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
73
- return (0, walletConnect_1.fetchWalletConnectPublicAddress)((0, wallet_book_1.getWalletBookWallet)(this.name), this.getClient(), Object.assign(Object.assign({}, opts), { onConnect: (payload) => {
73
+ return (0, walletConnect_1.fetchWalletConnectEVMPublicAddress)((0, wallet_book_1.getWalletBookWallet)(this.name), this.getClient(), Object.assign(Object.assign({}, opts), { onConnect: (payload) => {
74
74
  var _a;
75
75
  (_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
76
76
  this.connectedChain = payload.params[0].chainId ? 'EVM' : 'SOL';
@@ -1 +1 @@
1
- {"version":3,"file":"walletConnect.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/walletConnect/walletConnect.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"walletConnect.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/walletConnect/walletConnect.ts"],"names":[],"mappings":";;;AACA,iGAAqE;AACrE,mCAAgC;AAQhC,2DAAgE;AAEhE,4CAAwC;AACxC,yDAAsD;AAEtD,4DAQkC;AAClC,mDAAuD;AACvD,yEAAsE;AACtE,yCAA4C;AAC5C,MAAM,aAAc,SAAQ,yBAAW;IAgBrC,YAAY,EACV,UAAU,EACV,WAAW,GAIZ;QACC,KAAK,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;QAtBzB,oBAAe,GAAY,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE1C,mBAAc,GAAU,KAAK,CAAC;QAI9B,wBAAmB,GAAG,IAAI,CAAC;QAC3B,kCAA6B,GAAG,KAAK,CAAC;QACtC,oBAAe,GAAG,IAAI,CAAC;QACvB,gCAA2B,GAAG,KAAK,CAAC;QAclC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;IACzB,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAA,yCAAmB,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,SAAS;QACP,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,OAAO,IAAI,CAAC,MAAM,CAAC;SACpB;QAED,IAAI,CAAC,MAAM,GAAG,IAAA,0BAAU,EACtB,IAAA,yCAAmB,EAAC,IAAI,CAAC,IAAI,CAAC,EAC9B,IAAI,CAAC,aAAa,CACnB,CAAC;QACF,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAEQ,wBAAwB;QAC/B,IAAI,IAAI,CAAC,cAAc,KAAK,KAAK,EAAE;YACjC,OAAO,IAAI,CAAC;SACb;aAAM;YACL,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAChC,OAAO,OAAO,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAC,CAAC;SACjC;IACH,CAAC;IAED,mBAAmB,CAAC,SAA+B;QACjD,OAAO,IAAA,gDAAgC,EACrC;YACE,eAAe,EAAE,SAAS,CAAC,eAAe;YAC1C,aAAa,EAAE,SAAS,CAAC,aAAa;YACtC,YAAY,EAAE,SAAS,CAAC,YAAY;SACrC,EACD,IAAI,CAAC,SAAS,EAAE,CACjB,CAAC;IACJ,CAAC;IAED,sBAAsB;QACpB,IAAA,mDAAmC,EAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;IACxD,CAAC;IAEQ,eAAe;QACtB,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAChC,OAAO,MAAM;YACX,CAAC,CAAC,IAAI,eAAM,CAAC,SAAS,CAAC,YAAY,CAC/B,IAAI,2BAAqB,CAAC;gBACxB,SAAS,EAAE,MAAM;gBACjB,QAAQ,EAAR,oBAAQ;gBACR,GAAG,EAAE,IAAI,CAAC,gBAAgB,EAAE;aAC7B,CAAC,EACF,KAAK,CACN;YACH,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAED,oBAAoB;QAClB,OAAO,KAAK,CAAC;IACf,CAAC;IAEK,OAAO;;YACX,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAClC,CAAC;KAAA;IAEK,kBAAkB,CACtB,IAA6B;;YAE7B,OAAO,IAAA,kDAAkC,EACvC,IAAA,iCAAmB,EAAC,IAAI,CAAC,IAAI,CAAC,EAC9B,IAAI,CAAC,SAAS,EAAE,kCAEX,IAAI,KACP,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;;oBACrB,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,qDAAG,OAAO,CAAC,CAAC;oBAC3B,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;gBAClE,CAAC,IAEJ,CAAC;QACJ,CAAC;KAAA;IAEQ,WAAW;;QAClB,MAAM,MAAM,GAAG,IAAA,iCAAmB,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,IAAA,mBAAQ,GAAE,IAAI,CAAC,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,MAAM,CAAA,EAAE;YAC1C,OAAO,SAAS,CAAC;SAClB;QACD,OAAO,IAAA,2BAAW,EAAC,IAAI,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE;YAC/C,WAAW,EAAE,IAAA,gBAAK,GAAE,IAAI,IAAA,yCAAmB,EAAC,IAAI,CAAC,IAAI,CAAC,KAAK,WAAW;SACvE,CAAC,CAAC;IACL,CAAC;IAEK,WAAW,CAAC,aAAqB;;YACrC,OAAO,IAAA,gDAAgC,EACrC,aAAa,EACb,IAAA,iCAAmB,EAAC,IAAI,CAAC,IAAI,CAAC,EAC9B,IAAI,CAAC,SAAS,EAAE,CACjB,CAAC;QACJ,CAAC;KAAA;IAEK,cAAc,CAAC,aAAqB;;YACxC,OAAO,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;QACzC,CAAC;KAAA;IAEK,UAAU;;YACd,IAAA,wCAAwB,EAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QAC7C,CAAC;KAAA;IAEc,qBAAqB,CAAC,EACnC,OAAO,EACP,QAAQ,GAIT;;;;;YACC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAEhC,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;YAEjD,IAAI,gBAAgB,IAAI,gBAAgB,KAAK,OAAO,CAAC,OAAO,EAAE;gBAC5D,OAAO;aACR;YAED,IACE,IAAI,CAAC,2BAA2B,KAAK,SAAS;gBAC9C,IAAI,CAAC,2BAA2B,EAChC;gBACA,MAAM,IAAI,qBAAY,CACpB,wDAAwD,CACzD,CAAC;aACH;YAED,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE,EAAE;gBACpC,MAAM,IAAI,qBAAY,CAAC,iCAAiC,CAAC,CAAC;aAC3D;YAED,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,qBAAY,CAAC,kBAAkB,CAAC,CAAC;aAC5C;YAED,IAAI,IAAA,mBAAQ,GAAE,EAAE;gBACd,MAAM,QAAQ,GAAG,IAAA,2BAAW,EAAC,MAAM,CAAC,GAAG,EAAE,IAAA,iCAAmB,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBACzE,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC;aACjC;YAED,OAAO,OAAM,qBAAqB,YAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;QAC5D,CAAC;KAAA;IAEc,oBAAoB;;YACjC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC,MAAM,CAAC,SAAS;gBAAE,OAAO,EAAE,CAAC;YAEjC,OAAO,MAAM,CAAC,QAAQ,CAAC;QACzB,CAAC;KAAA;CACF;AAED,kBAAe,aAAa,CAAC"}
@@ -42,6 +42,7 @@ export interface IWindow {
42
42
  solana: ISolana;
43
43
  solflare: ISolana;
44
44
  starknet: IStarknetWindowObject;
45
+ starknet_argentX: IStarknetWindowObject;
45
46
  starknet_braavos: IStarknetWindowObject;
46
47
  }
47
48
  export interface IEthereum {
@@ -1,17 +0,0 @@
1
- import { IStarknetWindowObject } from 'get-starknet';
2
- import { AccountInterface } from 'starknet';
3
- import { WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
4
- export declare class StarknetProviderHelper {
5
- private _client?;
6
- _getConnectedChainType(): 'SN_GOERLI' | 'SN_MAIN' | undefined;
7
- _getProviderFromWallet(walletName: string): Promise<IStarknetWindowObject | undefined>;
8
- getInstance(walletName: string): Promise<IStarknetWindowObject | undefined>;
9
- isInstalledHelper(walletName: string): boolean;
10
- getPublicAddressWithName(walletName: string): Promise<string | undefined>;
11
- connectWithName(walletName: string): Promise<IStarknetWindowObject | undefined>;
12
- _signMessage(walletName: string, messageToSign: string): Promise<string[] | undefined>;
13
- _getBalance(walletName: string): Promise<string | undefined>;
14
- _setupEventListeners(listeners: WalletEventListeners, walletName: string): Promise<() => void>;
15
- _teardownEventListeners(walletName: string): Promise<void>;
16
- getConnectedAccountWithName(walletName: string): Promise<AccountInterface | undefined>;
17
- }
@@ -1,159 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.StarknetProviderHelper = void 0;
4
- const tslib_1 = require("tslib");
5
- const get_starknet_1 = require("get-starknet");
6
- const starknet_1 = require("starknet");
7
- const uint256_1 = require("starknet/dist/utils/uint256");
8
- const constants_1 = require("starknet/constants");
9
- const convertors_1 = require("../../utils/convertors");
10
- const constants_2 = require("../constants");
11
- const errors_1 = require("../../errors");
12
- const ethereumContractAbi_json_1 = tslib_1.__importDefault(require("./ethereumContractAbi.json"));
13
- const ACCOUNT_CHANGED_EVENT_LISTENER = 'accountsChanged';
14
- const NETWORK_CHANGED_EVENT_LISTENER = 'networkChanged';
15
- class StarknetProviderHelper {
16
- _getConnectedChainType() {
17
- var _a;
18
- const chainId = (_a = this._client) === null || _a === void 0 ? void 0 : _a.account.chainId;
19
- if (!chainId) {
20
- return undefined;
21
- }
22
- return chainId === constants_1.StarknetChainId.TESTNET ? 'SN_GOERLI' : 'SN_MAIN';
23
- }
24
- _getProviderFromWallet(walletName) {
25
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
26
- const providers = yield (0, get_starknet_1.getInstalledWallets)();
27
- return providers.find((provider) => provider.name === walletName);
28
- });
29
- }
30
- getInstance(walletName) {
31
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
32
- if (!this._client) {
33
- this._client = yield this.connectWithName(walletName);
34
- }
35
- return this._client;
36
- });
37
- }
38
- isInstalledHelper(walletName) {
39
- let starknetWindowInstance;
40
- if (walletName === 'Braavos') {
41
- starknetWindowInstance = window.starknet_braavos;
42
- }
43
- else {
44
- starknetWindowInstance = window.starknet;
45
- }
46
- return (starknetWindowInstance === null || starknetWindowInstance === void 0 ? void 0 : starknetWindowInstance.name) === walletName;
47
- }
48
- getPublicAddressWithName(walletName) {
49
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
50
- const instance = yield this.getInstance(walletName);
51
- if (!(instance === null || instance === void 0 ? void 0 : instance.isConnected)) {
52
- return undefined;
53
- }
54
- const { selectedAddress } = instance;
55
- return selectedAddress || Promise.resolve(undefined);
56
- });
57
- }
58
- connectWithName(walletName) {
59
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
60
- const provider = yield this._getProviderFromWallet(walletName);
61
- if (!provider) {
62
- return undefined;
63
- }
64
- try {
65
- if (!provider.isConnected) {
66
- yield provider.enable({ showModal: false });
67
- }
68
- return provider;
69
- }
70
- catch (err) {
71
- return undefined;
72
- }
73
- });
74
- }
75
- _signMessage(walletName, messageToSign) {
76
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
77
- const walletAddress = yield this.getPublicAddressWithName(walletName);
78
- if (!walletAddress) {
79
- return undefined;
80
- }
81
- const account = yield this.getConnectedAccountWithName(walletName);
82
- const encodedMessage = (0, convertors_1.formatTypedDataMessage)(messageToSign, this._getConnectedChainType());
83
- const signature = yield (account === null || account === void 0 ? void 0 : account.signMessage(encodedMessage));
84
- return signature;
85
- });
86
- }
87
- _getBalance(walletName) {
88
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
89
- const walletAddress = yield this.getPublicAddressWithName(walletName);
90
- if (!walletAddress) {
91
- return undefined;
92
- }
93
- const instance = yield this._getProviderFromWallet(walletName);
94
- if (!instance) {
95
- return undefined;
96
- }
97
- const { provider } = instance;
98
- const contract = new starknet_1.Contract(ethereumContractAbi_json_1.default, constants_2.ethStarknetAddress, provider);
99
- try {
100
- const { balance } = yield contract.functions['balanceOf'](walletAddress);
101
- const gweiBalance = parseInt((0, uint256_1.uint256ToBN)(balance).toString(10));
102
- /**
103
- * I'm dividing per 1e18 the returned balance as Starknet returns a Gwei number.
104
- * Read more here: https://www.investopedia.com/terms/g/gwei-ethereum.asp#toc-what-is-gwei
105
- */
106
- return (gweiBalance / 1e18).toFixed(6);
107
- }
108
- catch (error) {
109
- throw new errors_1.DynamicError('Something went wrong');
110
- }
111
- });
112
- }
113
- _setupEventListeners(listeners, walletName) {
114
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
115
- const instance = yield this._getProviderFromWallet(walletName);
116
- const handleAccountChange = (address) => tslib_1.__awaiter(this, void 0, void 0, function* () {
117
- var _a, _b;
118
- if (!address) {
119
- yield ((_a = listeners.onDisconnect) === null || _a === void 0 ? void 0 : _a.call(listeners));
120
- return;
121
- }
122
- if (address.toString()) {
123
- yield ((_b = listeners.onAccountChange) === null || _b === void 0 ? void 0 : _b.call(listeners, [address.toString()]));
124
- }
125
- });
126
- const handleNetworkChange = (network) => tslib_1.__awaiter(this, void 0, void 0, function* () {
127
- var _c, _d;
128
- if (!network) {
129
- yield ((_c = listeners.onDisconnect) === null || _c === void 0 ? void 0 : _c.call(listeners));
130
- return;
131
- }
132
- if (network.toString()) {
133
- yield ((_d = listeners.onChainChange) === null || _d === void 0 ? void 0 : _d.call(listeners, network.toString()));
134
- }
135
- });
136
- instance === null || instance === void 0 ? void 0 : instance.on(ACCOUNT_CHANGED_EVENT_LISTENER, handleAccountChange);
137
- instance === null || instance === void 0 ? void 0 : instance.on(NETWORK_CHANGED_EVENT_LISTENER, handleNetworkChange);
138
- return () => { };
139
- });
140
- }
141
- _teardownEventListeners(walletName) {
142
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
143
- const instance = yield this._getProviderFromWallet(walletName);
144
- instance === null || instance === void 0 ? void 0 : instance.off(ACCOUNT_CHANGED_EVENT_LISTENER, () => { });
145
- instance === null || instance === void 0 ? void 0 : instance.off(NETWORK_CHANGED_EVENT_LISTENER, () => { });
146
- });
147
- }
148
- getConnectedAccountWithName(walletName) {
149
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
150
- const instance = yield this._getProviderFromWallet(walletName);
151
- if (!(instance === null || instance === void 0 ? void 0 : instance.isConnected)) {
152
- return undefined;
153
- }
154
- return instance === null || instance === void 0 ? void 0 : instance.account;
155
- });
156
- }
157
- }
158
- exports.StarknetProviderHelper = StarknetProviderHelper;
159
- //# sourceMappingURL=starknetProviderHelper.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"starknetProviderHelper.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/starknet/starknetProviderHelper.ts"],"names":[],"mappings":"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"}