@reown/appkit-core 0.0.4 → 0.0.5
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/esm/exports/react.js +9 -7
- package/dist/esm/exports/react.js.map +1 -1
- package/dist/esm/src/controllers/AccountController.js +10 -6
- package/dist/esm/src/controllers/AccountController.js.map +1 -1
- package/dist/esm/src/controllers/ApiController.js +6 -5
- package/dist/esm/src/controllers/ApiController.js.map +1 -1
- package/dist/esm/src/controllers/BlockchainApiController.js +9 -7
- package/dist/esm/src/controllers/BlockchainApiController.js.map +1 -1
- package/dist/esm/src/controllers/ChainController.js +18 -13
- package/dist/esm/src/controllers/ChainController.js.map +1 -1
- package/dist/esm/src/controllers/ConnectionController.js +6 -5
- package/dist/esm/src/controllers/ConnectionController.js.map +1 -1
- package/dist/esm/src/controllers/ConnectorController.js +48 -21
- package/dist/esm/src/controllers/ConnectorController.js.map +1 -1
- package/dist/esm/src/controllers/EnsController.js +9 -10
- package/dist/esm/src/controllers/EnsController.js.map +1 -1
- package/dist/esm/src/controllers/EventsController.js +1 -1
- package/dist/esm/src/controllers/EventsController.js.map +1 -1
- package/dist/esm/src/controllers/ModalController.js +4 -5
- package/dist/esm/src/controllers/ModalController.js.map +1 -1
- package/dist/esm/src/controllers/NetworkController.js +4 -10
- package/dist/esm/src/controllers/NetworkController.js.map +1 -1
- package/dist/esm/src/controllers/OptionsController.js +7 -5
- package/dist/esm/src/controllers/OptionsController.js.map +1 -1
- package/dist/esm/src/controllers/SendController.js +5 -6
- package/dist/esm/src/controllers/SendController.js.map +1 -1
- package/dist/esm/src/controllers/SwapController.js +8 -7
- package/dist/esm/src/controllers/SwapController.js.map +1 -1
- package/dist/esm/src/controllers/TransactionsController.js +3 -3
- package/dist/esm/src/controllers/TransactionsController.js.map +1 -1
- package/dist/esm/src/utils/CoreHelperUtil.js +7 -0
- package/dist/esm/src/utils/CoreHelperUtil.js.map +1 -1
- package/dist/esm/src/utils/SwapApiUtil.js +4 -4
- package/dist/esm/src/utils/SwapApiUtil.js.map +1 -1
- package/dist/esm/tests/controllers/EnsController.test.js +4 -9
- package/dist/esm/tests/controllers/EnsController.test.js.map +1 -1
- package/dist/esm/tests/controllers/NetworkController.test.js +16 -16
- package/dist/esm/tests/controllers/NetworkController.test.js.map +1 -1
- package/dist/esm/tests/controllers/OptionsController.test.js +1 -1
- package/dist/esm/tests/controllers/OptionsController.test.js.map +1 -1
- package/dist/esm/tests/controllers/SwapController.test.js +1 -1
- package/dist/esm/tests/controllers/SwapController.test.js.map +1 -1
- package/dist/esm/tests/controllers/TransactionsController.test.js +3 -3
- package/dist/esm/tests/controllers/TransactionsController.test.js.map +1 -1
- package/dist/esm/tests/hooks/react.test.js +68 -0
- package/dist/esm/tests/hooks/react.test.js.map +1 -0
- package/dist/esm/tests/utils/EnsUtil.test.js +23 -0
- package/dist/esm/tests/utils/EnsUtil.test.js.map +1 -0
- package/dist/esm/tests/utils/FetchUtil.test.js +175 -0
- package/dist/esm/tests/utils/FetchUtil.test.js.map +1 -0
- package/dist/esm/tests/utils/OptionsUtil.test.js +20 -0
- package/dist/esm/tests/utils/OptionsUtil.test.js.map +1 -0
- package/dist/esm/tests/utils/RouterUtil.test.js +62 -0
- package/dist/esm/tests/utils/RouterUtil.test.js.map +1 -0
- package/dist/esm/tests/utils/StorageUtil.test.js +145 -0
- package/dist/esm/tests/utils/StorageUtil.test.js.map +1 -0
- package/dist/esm/tests/utils/SwapApiUtil.test.js +196 -0
- package/dist/esm/tests/utils/SwapApiUtil.test.js.map +1 -0
- package/dist/esm/tsconfig.tsbuildinfo +1 -1
- package/dist/types/exports/react.d.ts +1 -1
- package/dist/types/src/controllers/AccountController.d.ts +1 -0
- package/dist/types/src/controllers/ApiController.d.ts +1 -1
- package/dist/types/src/controllers/ChainController.d.ts +3 -2
- package/dist/types/src/controllers/ConnectionController.d.ts +1 -1
- package/dist/types/src/controllers/ConnectorController.d.ts +2 -2
- package/dist/types/src/controllers/EnsController.d.ts +3 -2
- package/dist/types/src/controllers/EventsController.d.ts +1 -1
- package/dist/types/src/controllers/NetworkController.d.ts +1 -1
- package/dist/types/src/controllers/OptionsController.d.ts +5 -1
- package/dist/types/src/controllers/SwapController.d.ts +3 -3
- package/dist/types/src/utils/CoreHelperUtil.d.ts +5 -2
- package/dist/types/src/utils/TypeUtil.d.ts +5 -4
- package/dist/types/tests/hooks/react.test.d.ts +1 -0
- package/dist/types/tests/mocks/SwapController.d.ts +3 -3
- package/dist/types/tests/utils/EnsUtil.test.d.ts +1 -0
- package/dist/types/tests/utils/FetchUtil.test.d.ts +1 -0
- package/dist/types/tests/utils/OptionsUtil.test.d.ts +1 -0
- package/dist/types/tests/utils/RouterUtil.test.d.ts +1 -0
- package/dist/types/tests/utils/StorageUtil.test.d.ts +1 -0
- package/dist/types/tests/utils/SwapApiUtil.test.d.ts +1 -0
- package/package.json +4 -4
|
@@ -1,19 +1,21 @@
|
|
|
1
1
|
import { useSnapshot } from 'valtio';
|
|
2
|
-
import { NetworkController } from '../src/controllers/NetworkController.js';
|
|
3
2
|
import { AccountController } from '../src/controllers/AccountController.js';
|
|
3
|
+
import { CoreHelperUtil } from '../src/utils/CoreHelperUtil.js';
|
|
4
|
+
import { ChainController } from '../src/controllers/ChainController.js';
|
|
4
5
|
// -- Hooks ------------------------------------------------------------
|
|
5
6
|
export function useWeb3ModalNetwork() {
|
|
6
|
-
const {
|
|
7
|
+
const { activeCaipNetwork } = useSnapshot(ChainController.state);
|
|
7
8
|
return {
|
|
8
|
-
caipNetwork,
|
|
9
|
-
chainId:
|
|
9
|
+
caipNetwork: activeCaipNetwork,
|
|
10
|
+
chainId: activeCaipNetwork?.chainId
|
|
10
11
|
};
|
|
11
12
|
}
|
|
12
13
|
export function useWeb3ModalAccount() {
|
|
13
|
-
const {
|
|
14
|
+
const { status } = useSnapshot(AccountController.state);
|
|
15
|
+
const { activeCaipAddress } = useSnapshot(ChainController.state);
|
|
14
16
|
return {
|
|
15
|
-
address,
|
|
16
|
-
isConnected,
|
|
17
|
+
address: CoreHelperUtil.getPlainAddress(activeCaipAddress),
|
|
18
|
+
isConnected: Boolean(activeCaipAddress),
|
|
17
19
|
status
|
|
18
20
|
};
|
|
19
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react.js","sourceRoot":"","sources":["../../../exports/react.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAA;AAC3E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"react.js","sourceRoot":"","sources":["../../../exports/react.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAA;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAA;AAEvE,wEAAwE;AACxE,MAAM,UAAU,mBAAmB;IACjC,MAAM,EAAE,iBAAiB,EAAE,GAAG,WAAW,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;IAEhE,OAAO;QACL,WAAW,EAAE,iBAAiB;QAC9B,OAAO,EAAE,iBAAiB,EAAE,OAAO;KACpC,CAAA;AACH,CAAC;AACD,MAAM,UAAU,mBAAmB;IACjC,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAA;IACvD,MAAM,EAAE,iBAAiB,EAAE,GAAG,WAAW,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;IAEhE,OAAO;QACL,OAAO,EAAE,cAAc,CAAC,eAAe,CAAC,iBAAiB,CAAC;QAC1D,WAAW,EAAE,OAAO,CAAC,iBAAiB,CAAC;QACvC,MAAM;KACP,CAAA;AACH,CAAC"}
|
|
@@ -4,7 +4,6 @@ import { SnackController } from './SnackController.js';
|
|
|
4
4
|
import { SwapController } from './SwapController.js';
|
|
5
5
|
import { SwapApiUtil } from '../utils/SwapApiUtil.js';
|
|
6
6
|
import { ChainController } from './ChainController.js';
|
|
7
|
-
import { NetworkController } from './NetworkController.js';
|
|
8
7
|
import { proxy, ref } from 'valtio/vanilla';
|
|
9
8
|
// -- State --------------------------------------------- //
|
|
10
9
|
const state = proxy({
|
|
@@ -53,15 +52,19 @@ export const AccountController = {
|
|
|
53
52
|
getChainIsConnected(chain) {
|
|
54
53
|
return ChainController.getAccountProp('isConnected', chain);
|
|
55
54
|
},
|
|
55
|
+
getCaipAddress(chain) {
|
|
56
|
+
return ChainController.getAccountProp('caipAddress', chain);
|
|
57
|
+
},
|
|
56
58
|
setProvider(provider, chain) {
|
|
57
59
|
if (provider) {
|
|
58
60
|
ChainController.setAccountProp('provider', provider, chain);
|
|
59
61
|
}
|
|
60
62
|
},
|
|
61
63
|
setCaipAddress(caipAddress, chain) {
|
|
62
|
-
const
|
|
64
|
+
const newAddress = caipAddress ? CoreHelperUtil.getPlainAddress(caipAddress) : undefined;
|
|
65
|
+
ChainController.state.activeCaipAddress = caipAddress;
|
|
63
66
|
ChainController.setAccountProp('caipAddress', caipAddress, chain);
|
|
64
|
-
ChainController.setAccountProp('address',
|
|
67
|
+
ChainController.setAccountProp('address', newAddress, chain);
|
|
65
68
|
},
|
|
66
69
|
setBalance(balance, balanceSymbol, chain) {
|
|
67
70
|
ChainController.setAccountProp('balance', balance, chain);
|
|
@@ -125,9 +128,10 @@ export const AccountController = {
|
|
|
125
128
|
}
|
|
126
129
|
},
|
|
127
130
|
async fetchTokenBalance() {
|
|
128
|
-
const chainId =
|
|
129
|
-
const chain =
|
|
130
|
-
const
|
|
131
|
+
const chainId = ChainController.state.activeCaipNetwork?.id;
|
|
132
|
+
const chain = ChainController.state.activeCaipNetwork?.chainNamespace;
|
|
133
|
+
const caipAddress = ChainController.state.activeCaipAddress;
|
|
134
|
+
const address = caipAddress ? CoreHelperUtil.getPlainAddress(caipAddress) : undefined;
|
|
131
135
|
try {
|
|
132
136
|
if (address && chainId && chain) {
|
|
133
137
|
const response = await BlockchainApiController.getBalance(address, chainId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountController.js","sourceRoot":"","sources":["../../../../src/controllers/AccountController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAU3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAErD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"AccountController.js","sourceRoot":"","sources":["../../../../src/controllers/AccountController.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ import { AssetController } from './AssetController.js';
|
|
|
7
7
|
import { ConnectorController } from './ConnectorController.js';
|
|
8
8
|
import { NetworkController } from './NetworkController.js';
|
|
9
9
|
import { OptionsController } from './OptionsController.js';
|
|
10
|
+
import { ChainController } from './ChainController.js';
|
|
10
11
|
// -- Helpers ------------------------------------------- //
|
|
11
12
|
const baseUrl = CoreHelperUtil.getApiUrl();
|
|
12
13
|
export const api = new FetchUtil({ baseUrl, clientId: null });
|
|
@@ -34,7 +35,7 @@ export const ApiController = {
|
|
|
34
35
|
const { projectId, sdkType, sdkVersion } = OptionsController.state;
|
|
35
36
|
return {
|
|
36
37
|
'x-project-id': projectId,
|
|
37
|
-
'x-sdk-type': sdkType || '
|
|
38
|
+
'x-sdk-type': sdkType || 'appkit',
|
|
38
39
|
'x-sdk-version': sdkVersion || 'html-wagmi-4.2.2'
|
|
39
40
|
};
|
|
40
41
|
},
|
|
@@ -116,7 +117,7 @@ export const ApiController = {
|
|
|
116
117
|
headers: ApiController._getApiHeaders(),
|
|
117
118
|
params: {
|
|
118
119
|
page: '1',
|
|
119
|
-
chains:
|
|
120
|
+
chains: ChainController.state.activeCaipNetwork?.id,
|
|
120
121
|
entries: recommendedEntries,
|
|
121
122
|
include: includeWalletIds?.join(','),
|
|
122
123
|
exclude: exclude?.join(',')
|
|
@@ -146,7 +147,7 @@ export const ApiController = {
|
|
|
146
147
|
params: {
|
|
147
148
|
page: String(page),
|
|
148
149
|
entries,
|
|
149
|
-
chains:
|
|
150
|
+
chains: ChainController.state.activeCaipNetwork?.id,
|
|
150
151
|
include: includeWalletIds?.join(','),
|
|
151
152
|
exclude: exclude.join(',')
|
|
152
153
|
}
|
|
@@ -167,7 +168,7 @@ export const ApiController = {
|
|
|
167
168
|
params: {
|
|
168
169
|
page: '1',
|
|
169
170
|
entries: String(ids.length),
|
|
170
|
-
chains:
|
|
171
|
+
chains: ChainController.state.activeCaipNetwork?.id,
|
|
171
172
|
include: ids?.join(',')
|
|
172
173
|
}
|
|
173
174
|
});
|
|
@@ -189,7 +190,7 @@ export const ApiController = {
|
|
|
189
190
|
page: '1',
|
|
190
191
|
entries: '100',
|
|
191
192
|
search: search?.trim(),
|
|
192
|
-
chains:
|
|
193
|
+
chains: ChainController.state.activeCaipNetwork?.id,
|
|
193
194
|
include: includeWalletIds?.join(','),
|
|
194
195
|
exclude: excludeWalletIds?.join(',')
|
|
195
196
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiController.js","sourceRoot":"","sources":["../../../../src/controllers/ApiController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,IAAI,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAOrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"ApiController.js","sourceRoot":"","sources":["../../../../src/controllers/ApiController.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { ConstantsUtil } from '../utils/ConstantsUtil.js';
|
|
2
2
|
import { CoreHelperUtil } from '../utils/CoreHelperUtil.js';
|
|
3
3
|
import { FetchUtil } from '../utils/FetchUtil.js';
|
|
4
|
-
import { ConstantsUtil as CommonConstantsUtil } from '@reown/appkit-common';
|
|
5
4
|
import { OptionsController } from './OptionsController.js';
|
|
6
5
|
import { proxy } from 'valtio/vanilla';
|
|
7
6
|
import { AccountController } from './AccountController.js';
|
|
7
|
+
import { ChainController } from './ChainController.js';
|
|
8
8
|
const DEFAULT_OPTIONS = {
|
|
9
9
|
purchaseCurrencies: [
|
|
10
10
|
{
|
|
@@ -94,7 +94,9 @@ export const BlockchainApiController = {
|
|
|
94
94
|
path: `/v1/identity/${address}`,
|
|
95
95
|
params: {
|
|
96
96
|
projectId: OptionsController.state.projectId,
|
|
97
|
-
sender:
|
|
97
|
+
sender: ChainController.state.activeCaipAddress
|
|
98
|
+
? CoreHelperUtil.getPlainAddress(ChainController.state.activeCaipAddress)
|
|
99
|
+
: undefined
|
|
98
100
|
}
|
|
99
101
|
});
|
|
100
102
|
},
|
|
@@ -160,7 +162,7 @@ export const BlockchainApiController = {
|
|
|
160
162
|
},
|
|
161
163
|
headers: {
|
|
162
164
|
'Content-Type': 'application/json',
|
|
163
|
-
'x-sdk-type': sdkType
|
|
165
|
+
'x-sdk-type': sdkType,
|
|
164
166
|
'x-sdk-version': sdkVersion || 'html-wagmi-4.2.2'
|
|
165
167
|
}
|
|
166
168
|
});
|
|
@@ -171,7 +173,7 @@ export const BlockchainApiController = {
|
|
|
171
173
|
path: `/v1/convert/gas-price`,
|
|
172
174
|
headers: {
|
|
173
175
|
'Content-Type': 'application/json',
|
|
174
|
-
'x-sdk-type': sdkType
|
|
176
|
+
'x-sdk-type': sdkType,
|
|
175
177
|
'x-sdk-version': sdkVersion || 'html-wagmi-4.2.2'
|
|
176
178
|
},
|
|
177
179
|
params: {
|
|
@@ -204,7 +206,7 @@ export const BlockchainApiController = {
|
|
|
204
206
|
path: `/v1/convert/build-approve`,
|
|
205
207
|
headers: {
|
|
206
208
|
'Content-Type': 'application/json',
|
|
207
|
-
'x-sdk-type': sdkType
|
|
209
|
+
'x-sdk-type': sdkType,
|
|
208
210
|
'x-sdk-version': sdkVersion || 'html-wagmi-4.2.2'
|
|
209
211
|
},
|
|
210
212
|
params: {
|
|
@@ -220,7 +222,7 @@ export const BlockchainApiController = {
|
|
|
220
222
|
return state.api.get({
|
|
221
223
|
path: `/v1/account/${address}/balance`,
|
|
222
224
|
headers: {
|
|
223
|
-
'x-sdk-type': sdkType
|
|
225
|
+
'x-sdk-type': sdkType,
|
|
224
226
|
'x-sdk-version': sdkVersion || 'html-wagmi-4.2.2'
|
|
225
227
|
},
|
|
226
228
|
params: {
|
|
@@ -233,7 +235,7 @@ export const BlockchainApiController = {
|
|
|
233
235
|
},
|
|
234
236
|
async lookupEnsName(name) {
|
|
235
237
|
return state.api.get({
|
|
236
|
-
path: `/v1/profile/account/${name}
|
|
238
|
+
path: `/v1/profile/account/${name}`,
|
|
237
239
|
params: {
|
|
238
240
|
projectId: OptionsController.state.projectId,
|
|
239
241
|
apiVersion: '2'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BlockchainApiController.js","sourceRoot":"","sources":["../../../../src/controllers/BlockchainApiController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"BlockchainApiController.js","sourceRoot":"","sources":["../../../../src/controllers/BlockchainApiController.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,7 @@ const networkState = {
|
|
|
21
21
|
// -- State --------------------------------------------- //
|
|
22
22
|
const state = proxy({
|
|
23
23
|
chains: proxyMap(),
|
|
24
|
+
activeCaipAddress: undefined,
|
|
24
25
|
activeChain: undefined,
|
|
25
26
|
activeCaipNetwork: undefined,
|
|
26
27
|
noAdapters: false,
|
|
@@ -70,13 +71,11 @@ export const ChainController = {
|
|
|
70
71
|
}
|
|
71
72
|
},
|
|
72
73
|
initializeUniversalAdapter(adapter, adapters) {
|
|
73
|
-
state.activeChain = 'eip155';
|
|
74
|
-
PublicStateController.set({ activeChain: 'eip155' });
|
|
75
74
|
state.universalAdapter = adapter;
|
|
76
75
|
if (adapters.length === 0) {
|
|
77
76
|
this.setActiveCaipNetwork(adapter?.defaultNetwork);
|
|
78
77
|
}
|
|
79
|
-
const chains =
|
|
78
|
+
const chains = adapters.map(a => a.chainNamespace);
|
|
80
79
|
chains.forEach((chain) => {
|
|
81
80
|
state.chains.set(chain, {
|
|
82
81
|
chainNamespace: chain,
|
|
@@ -116,6 +115,9 @@ export const ChainController = {
|
|
|
116
115
|
});
|
|
117
116
|
state.chains.set(chain, chainAdapter);
|
|
118
117
|
if (replaceState || state.chains.size === 1 || state.activeChain === chain) {
|
|
118
|
+
if (accountProps.caipAddress) {
|
|
119
|
+
state.activeCaipAddress = accountProps.caipAddress;
|
|
120
|
+
}
|
|
119
121
|
AccountController.replaceState(chainAdapter.accountState);
|
|
120
122
|
}
|
|
121
123
|
}
|
|
@@ -126,19 +128,17 @@ export const ChainController = {
|
|
|
126
128
|
[prop]: value
|
|
127
129
|
}, replaceState);
|
|
128
130
|
},
|
|
129
|
-
setActiveChain(chain) {
|
|
131
|
+
setActiveChain(chain, caipNetwork) {
|
|
130
132
|
const newAdapter = chain ? state.chains.get(chain) : undefined;
|
|
131
133
|
if (newAdapter && newAdapter.chainNamespace !== state.activeChain) {
|
|
132
134
|
state.activeChain = newAdapter.chainNamespace;
|
|
133
|
-
state.
|
|
134
|
-
|
|
135
|
-
: undefined;
|
|
135
|
+
state.activeCaipAddress = newAdapter.accountState?.caipAddress;
|
|
136
|
+
state.activeCaipNetwork = caipNetwork;
|
|
136
137
|
if (!newAdapter.accountState) {
|
|
137
138
|
this.resetAccount(newAdapter.chainNamespace);
|
|
138
139
|
}
|
|
139
|
-
AccountController.replaceState(newAdapter.accountState);
|
|
140
140
|
NetworkController.replaceState(newAdapter.networkState);
|
|
141
|
-
|
|
141
|
+
AccountController.replaceState(newAdapter.accountState);
|
|
142
142
|
PublicStateController.set({
|
|
143
143
|
activeChain: chain,
|
|
144
144
|
selectedNetworkId: newAdapter.networkState?.caipNetwork?.id
|
|
@@ -150,15 +150,17 @@ export const ChainController = {
|
|
|
150
150
|
return;
|
|
151
151
|
}
|
|
152
152
|
if (caipNetwork.chainNamespace !== state.activeChain) {
|
|
153
|
-
this.setActiveChain(caipNetwork.chainNamespace);
|
|
153
|
+
this.setActiveChain(caipNetwork.chainNamespace, caipNetwork);
|
|
154
|
+
return;
|
|
154
155
|
}
|
|
155
|
-
state.activeCaipNetwork =
|
|
156
|
+
state.activeCaipNetwork = caipNetwork;
|
|
156
157
|
state.activeChain = caipNetwork.chainNamespace;
|
|
157
|
-
this.setCaipNetwork(caipNetwork.chainNamespace, caipNetwork, true);
|
|
158
158
|
PublicStateController.set({
|
|
159
159
|
activeChain: caipNetwork.chainNamespace,
|
|
160
160
|
selectedNetworkId: caipNetwork?.id
|
|
161
161
|
});
|
|
162
|
+
SafeLocalStorage.setItem(SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK, JSON.stringify(caipNetwork));
|
|
163
|
+
SafeLocalStorage.setItem(SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK_ID, caipNetwork.id);
|
|
162
164
|
},
|
|
163
165
|
/**
|
|
164
166
|
* The setCaipNetwork function is being called for different purposes and it needs to be controlled if it should replace the NetworkController state or not.
|
|
@@ -169,6 +171,8 @@ export const ChainController = {
|
|
|
169
171
|
* @param shouldReplace - if true, it will replace the NetworkController state
|
|
170
172
|
*/
|
|
171
173
|
setCaipNetwork(chain, caipNetwork, shouldReplace = false) {
|
|
174
|
+
state.activeCaipNetwork = caipNetwork;
|
|
175
|
+
state.activeChain = caipNetwork?.chainNamespace;
|
|
172
176
|
this.setChainNetworkData(chain, { caipNetwork }, shouldReplace);
|
|
173
177
|
},
|
|
174
178
|
setActiveConnector(connector) {
|
|
@@ -203,7 +207,7 @@ export const ChainController = {
|
|
|
203
207
|
},
|
|
204
208
|
getConnectionControllerClient(_chain) {
|
|
205
209
|
const chain = _chain || state.activeChain;
|
|
206
|
-
const isWcConnector = SafeLocalStorage.getItem(SafeLocalStorageKeys.
|
|
210
|
+
const isWcConnector = SafeLocalStorage.getItem(SafeLocalStorageKeys.CONNECTED_CONNECTOR) === 'WALLET_CONNECT';
|
|
207
211
|
const universalConnectionControllerClient = state.universalAdapter.connectionControllerClient;
|
|
208
212
|
const hasWagmiAdapter = state.chains.get('eip155')?.adapterType === 'wagmi';
|
|
209
213
|
const shouldUseUniversalAdapter = (isWcConnector && !hasWagmiAdapter) || state.noAdapters;
|
|
@@ -265,6 +269,7 @@ export const ChainController = {
|
|
|
265
269
|
if (!chainToWrite) {
|
|
266
270
|
throw new Error('Chain is required to set account prop');
|
|
267
271
|
}
|
|
272
|
+
ChainController.state.activeCaipAddress = undefined;
|
|
268
273
|
this.setChainAccountData(chainToWrite, ref({
|
|
269
274
|
isConnected: false,
|
|
270
275
|
smartAccountDeployed: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChainController.js","sourceRoot":"","sources":["../../../../src/controllers/ChainController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,YAAY,IAAI,MAAM,EAAE,MAAM,sBAAsB,CAAA;AACvE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,IAAI,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAG7D,OAAO,EAAE,iBAAiB,EAA+B,MAAM,wBAAwB,CAAA;AACvF,OAAO,EAAE,iBAAiB,EAA+B,MAAM,wBAAwB,CAAA;AACvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,EACL,gBAAgB,EAChB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"ChainController.js","sourceRoot":"","sources":["../../../../src/controllers/ChainController.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ import {} from '@reown/appkit-wallet';
|
|
|
8
8
|
import { ModalController } from './ModalController.js';
|
|
9
9
|
import { ConnectorController } from './ConnectorController.js';
|
|
10
10
|
import { EventsController } from './EventsController.js';
|
|
11
|
-
import { NetworkController } from './NetworkController.js';
|
|
12
11
|
import { RouterController } from './RouterController.js';
|
|
13
12
|
// -- State --------------------------------------------- //
|
|
14
13
|
const state = proxy({
|
|
@@ -35,10 +34,12 @@ export const ConnectionController = {
|
|
|
35
34
|
state.wcPairingExpiry = CoreHelperUtil.getPairingExpiry();
|
|
36
35
|
});
|
|
37
36
|
},
|
|
38
|
-
async connectExternal(options, chain) {
|
|
37
|
+
async connectExternal(options, chain, setChain = true) {
|
|
39
38
|
await this._getClient(chain).connectExternal?.(options);
|
|
40
|
-
|
|
41
|
-
|
|
39
|
+
if (setChain) {
|
|
40
|
+
ChainController.setActiveChain(chain);
|
|
41
|
+
StorageUtil.setConnectedConnector(options.type);
|
|
42
|
+
}
|
|
42
43
|
},
|
|
43
44
|
async reconnectExternal(options) {
|
|
44
45
|
await this._getClient().reconnectExternal?.(options);
|
|
@@ -56,7 +57,7 @@ export const ConnectionController = {
|
|
|
56
57
|
EventsController.sendEvent({
|
|
57
58
|
type: 'track',
|
|
58
59
|
event: 'SET_PREFERRED_ACCOUNT_TYPE',
|
|
59
|
-
properties: { accountType, network:
|
|
60
|
+
properties: { accountType, network: ChainController.state.activeCaipNetwork?.id || '' }
|
|
60
61
|
});
|
|
61
62
|
},
|
|
62
63
|
async signMessage(message) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectionController.js","sourceRoot":"","sources":["../../../../src/controllers/ConnectionController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,IAAI,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAQrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAsB,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAExD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ConnectionController.js","sourceRoot":"","sources":["../../../../src/controllers/ConnectionController.ts"],"names":[],"mappings":"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"}
|