@reown/appkit-core 0.0.3 → 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,11 +1,11 @@
|
|
|
1
1
|
import { subscribeKey as subKey } from 'valtio/vanilla/utils';
|
|
2
2
|
import { proxy, snapshot } from 'valtio/vanilla';
|
|
3
|
-
import {
|
|
3
|
+
import { getW3mThemeVariables } from '@reown/appkit-common';
|
|
4
4
|
import { OptionsController } from './OptionsController.js';
|
|
5
5
|
import { ThemeController } from './ThemeController.js';
|
|
6
6
|
// -- State --------------------------------------------- //
|
|
7
7
|
const state = proxy({
|
|
8
|
-
|
|
8
|
+
allConnectors: [],
|
|
9
9
|
connectors: []
|
|
10
10
|
});
|
|
11
11
|
// -- Controller ---------------------------------------- //
|
|
@@ -15,25 +15,35 @@ export const ConnectorController = {
|
|
|
15
15
|
return subKey(state, key, callback);
|
|
16
16
|
},
|
|
17
17
|
setConnectors(connectors) {
|
|
18
|
-
connectors.
|
|
19
|
-
|
|
20
|
-
|
|
18
|
+
const newConnectors = connectors.filter(newConnector => !state.allConnectors.some(existingConnector => existingConnector.id === newConnector.id &&
|
|
19
|
+
this.getConnectorName(existingConnector.name) ===
|
|
20
|
+
this.getConnectorName(newConnector.name) &&
|
|
21
|
+
existingConnector.chain === newConnector.chain));
|
|
22
|
+
state.allConnectors = [...state.connectors, ...newConnectors];
|
|
23
|
+
state.connectors = this.mergeMultiChainConnectors(state.allConnectors);
|
|
21
24
|
},
|
|
22
25
|
mergeMultiChainConnectors(connectors) {
|
|
23
26
|
const connectorsByNameMap = this.generateConnectorMapByName(connectors);
|
|
24
|
-
const
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
27
|
+
const mergedConnectors = [];
|
|
28
|
+
connectorsByNameMap.forEach(keyConnectors => {
|
|
29
|
+
const firstItem = keyConnectors[0];
|
|
30
|
+
if (keyConnectors.length > 1) {
|
|
31
|
+
mergedConnectors.push({
|
|
32
|
+
name: firstItem?.name,
|
|
33
|
+
imageUrl: firstItem?.imageUrl,
|
|
34
|
+
imageId: firstItem?.imageId,
|
|
35
|
+
connectors: [...keyConnectors],
|
|
36
|
+
type: 'MULTI_CHAIN',
|
|
37
|
+
// These values are just placeholders, we don't use them in multi-chain connector select screen
|
|
38
|
+
chain: 'eip155',
|
|
39
|
+
id: firstItem?.id || ''
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
else if (firstItem) {
|
|
43
|
+
mergedConnectors.push(firstItem);
|
|
33
44
|
}
|
|
34
|
-
return _connectors[0];
|
|
35
45
|
});
|
|
36
|
-
return
|
|
46
|
+
return mergedConnectors;
|
|
37
47
|
},
|
|
38
48
|
generateConnectorMapByName(connectors) {
|
|
39
49
|
const connectorsByNameMap = new Map();
|
|
@@ -65,16 +75,32 @@ export const ConnectorController = {
|
|
|
65
75
|
const uniqueConnectors = [];
|
|
66
76
|
connectors.forEach(c => {
|
|
67
77
|
if (!uniqueConnectors.find(uc => uc.chain === c.chain)) {
|
|
68
|
-
uniqueConnectors.push(
|
|
69
|
-
...c,
|
|
70
|
-
name: ConstantsUtil.CHAIN_NAME_MAP[c.chain]
|
|
71
|
-
});
|
|
78
|
+
uniqueConnectors.push(c);
|
|
72
79
|
}
|
|
73
80
|
});
|
|
74
81
|
return uniqueConnectors;
|
|
75
82
|
},
|
|
76
83
|
addConnector(connector) {
|
|
77
|
-
|
|
84
|
+
if (connector.id === 'w3mAuth') {
|
|
85
|
+
const authConnector = connector;
|
|
86
|
+
const optionsState = snapshot(OptionsController.state);
|
|
87
|
+
const themeMode = ThemeController.getSnapshot().themeMode;
|
|
88
|
+
const themeVariables = ThemeController.getSnapshot().themeVariables;
|
|
89
|
+
authConnector?.provider?.syncDappData?.({
|
|
90
|
+
metadata: optionsState.metadata,
|
|
91
|
+
sdkVersion: optionsState.sdkVersion,
|
|
92
|
+
projectId: optionsState.projectId
|
|
93
|
+
});
|
|
94
|
+
authConnector.provider.syncTheme({
|
|
95
|
+
themeMode,
|
|
96
|
+
themeVariables,
|
|
97
|
+
w3mThemeVariables: getW3mThemeVariables(themeVariables, themeMode)
|
|
98
|
+
});
|
|
99
|
+
this.setConnectors([connector]);
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
this.setConnectors([connector]);
|
|
103
|
+
}
|
|
78
104
|
},
|
|
79
105
|
getAuthConnector() {
|
|
80
106
|
return state.connectors.find(c => c.type === 'AUTH');
|
|
@@ -99,6 +125,7 @@ export const ConnectorController = {
|
|
|
99
125
|
authConnector?.provider?.syncDappData?.({
|
|
100
126
|
metadata: optionsState.metadata,
|
|
101
127
|
sdkVersion: optionsState.sdkVersion,
|
|
128
|
+
sdkType: optionsState.sdkType,
|
|
102
129
|
projectId: optionsState.projectId
|
|
103
130
|
});
|
|
104
131
|
authConnector.provider.syncTheme({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectorController.js","sourceRoot":"","sources":["../../../../src/controllers/ConnectorController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,IAAI,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEhD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ConnectorController.js","sourceRoot":"","sources":["../../../../src/controllers/ConnectorController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,IAAI,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEhD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAatD,4DAA4D;AAC5D,MAAM,KAAK,GAAG,KAAK,CAA2B;IAC5C,aAAa,EAAE,EAAE;IACjB,UAAU,EAAE,EAAE;CACf,CAAC,CAAA;AAEF,4DAA4D;AAC5D,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,KAAK;IAEL,YAAY,CAAqB,GAAM,EAAE,QAAsD;QAC7F,OAAO,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAA;IACrC,CAAC;IAED,aAAa,CAAC,UAAkD;QAC9D,MAAM,aAAa,GAAG,UAAU,CAAC,MAAM,CACrC,YAAY,CAAC,EAAE,CACb,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CACvB,iBAAiB,CAAC,EAAE,CAClB,iBAAiB,CAAC,EAAE,KAAK,YAAY,CAAC,EAAE;YACxC,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAC3C,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,IAAI,CAAC;YAC1C,iBAAiB,CAAC,KAAK,KAAK,YAAY,CAAC,KAAK,CACjD,CACJ,CAAA;QAED,KAAK,CAAC,aAAa,GAAG,CAAC,GAAG,KAAK,CAAC,UAAU,EAAE,GAAG,aAAa,CAAC,CAAA;QAC7D,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;IACxE,CAAC;IAED,yBAAyB,CAAC,UAAuB;QAC/C,MAAM,mBAAmB,GAAG,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,CAAA;QAEvE,MAAM,gBAAgB,GAA6B,EAAE,CAAA;QAErD,mBAAmB,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;YAC1C,MAAM,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;YAElC,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,gBAAgB,CAAC,IAAI,CAAC;oBACpB,IAAI,EAAE,SAAS,EAAE,IAAI;oBACrB,QAAQ,EAAE,SAAS,EAAE,QAAQ;oBAC7B,OAAO,EAAE,SAAS,EAAE,OAAO;oBAC3B,UAAU,EAAE,CAAC,GAAG,aAAa,CAAC;oBAC9B,IAAI,EAAE,aAAa;oBACnB,+FAA+F;oBAC/F,KAAK,EAAE,QAAQ;oBACf,EAAE,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE;iBACxB,CAAC,CAAA;YACJ,CAAC;iBAAM,IAAI,SAAS,EAAE,CAAC;gBACrB,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAClC,CAAC;QACH,CAAC,CAAC,CAAA;QAEF,OAAO,gBAAgB,CAAA;IACzB,CAAC;IAED,0BAA0B,CAAC,UAAuB;QAChD,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAuB,CAAA;QAE1D,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC7B,MAAM,EAAE,IAAI,EAAE,GAAG,SAAS,CAAA;YAC1B,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;YAEjD,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,OAAM;YACR,CAAC;YAED,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,CAAA;YACrE,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,KAAK,CAAC,CAAA;YACjF,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACvB,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAClC,CAAC;YACD,mBAAmB,CAAC,GAAG,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAA;QAC1D,CAAC,CAAC,CAAA;QAEF,OAAO,mBAAmB,CAAA;IAC5B,CAAC;IAED,gBAAgB,CAAC,IAAwB;QACvC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,IAAI,CAAA;QACb,CAAC;QAED,MAAM,eAAe,GAAG;YACtB,cAAc,EAAE,OAAO;SACxB,CAAA;QAED,OAAQ,eAA0C,CAAC,IAAI,CAAC,IAAI,IAAI,CAAA;IAClE,CAAC;IAED,yBAAyB,CAAC,UAAuB;QAC/C,MAAM,gBAAgB,GAAgB,EAAE,CAAA;QAExC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACrB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvD,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YAC1B,CAAC;QACH,CAAC,CAAC,CAAA;QAEF,OAAO,gBAAgB,CAAA;IACzB,CAAC;IAED,YAAY,CAAC,SAAoC;QAC/C,IAAI,SAAS,CAAC,EAAE,KAAK,SAAS,EAAE,CAAC;YAC/B,MAAM,aAAa,GAAG,SAA0B,CAAA;YAEhD,MAAM,YAAY,GAAG,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAmC,CAAA;YACxF,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC,SAAS,CAAA;YACzD,MAAM,cAAc,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC,cAAc,CAAA;YAEnE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;gBACtC,QAAQ,EAAE,YAAY,CAAC,QAAQ;gBAC/B,UAAU,EAAE,YAAY,CAAC,UAAU;gBACnC,SAAS,EAAE,YAAY,CAAC,SAAS;aAClC,CAAC,CAAA;YACF,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAC/B,SAAS;gBACT,cAAc;gBACd,iBAAiB,EAAE,oBAAoB,CAAC,cAAc,EAAE,SAAS,CAAC;aACnE,CAAC,CAAA;YACF,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,CAAC,CAAA;QACjC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,CAAC,CAAA;QACjC,CAAC;IACH,CAAC;IAED,gBAAgB;QACd,OAAO,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAA8B,CAAA;IACnF,CAAC;IAED,yBAAyB;QACvB,OAAO,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IACpF,CAAC;IAED,aAAa;QACX,OAAO,KAAK,CAAC,UAAU,CAAA;IACzB,CAAC;IAED,YAAY,CAAC,EAAU,EAAE,IAAoB;QAC3C,OAAO,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC,CAAA;IACjF,CAAC;IAED,mBAAmB,CAAC,SAAoC;QACtD,IAAI,SAAS,CAAC,EAAE,KAAK,SAAS,EAAE,CAAC;YAC/B,OAAM;QACR,CAAC;QAED,MAAM,aAAa,GAAG,SAA0B,CAAA;QAEhD,MAAM,YAAY,GAAG,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAmC,CAAA;QACxF,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC,SAAS,CAAA;QACzD,MAAM,cAAc,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC,cAAc,CAAA;QAEnE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;YACtC,QAAQ,EAAE,YAAY,CAAC,QAAQ;YAC/B,UAAU,EAAE,YAAY,CAAC,UAAU;YACnC,OAAO,EAAE,YAAY,CAAC,OAAO;YAC7B,SAAS,EAAE,YAAY,CAAC,SAAS;SAClC,CAAC,CAAA;QACF,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC;YAC/B,SAAS;YACT,cAAc;YACd,iBAAiB,EAAE,oBAAoB,CAAC,cAAc,EAAE,SAAS,CAAC;SACnE,CAAC,CAAA;IACJ,CAAC;CACF,CAAA"}
|
|
@@ -5,10 +5,9 @@ import { AccountController } from './AccountController.js';
|
|
|
5
5
|
import { ConnectorController } from './ConnectorController.js';
|
|
6
6
|
import { RouterController } from './RouterController.js';
|
|
7
7
|
import { ConnectionController } from './ConnectionController.js';
|
|
8
|
-
import { NetworkController } from './NetworkController.js';
|
|
9
8
|
import { NetworkUtil } from '@reown/appkit-common';
|
|
10
9
|
import { EnsUtil } from '../utils/EnsUtil.js';
|
|
11
|
-
import {
|
|
10
|
+
import { ChainController } from './ChainController.js';
|
|
12
11
|
// -- State --------------------------------------------- //
|
|
13
12
|
const state = proxy({
|
|
14
13
|
suggestions: [],
|
|
@@ -41,15 +40,15 @@ export const EnsController = {
|
|
|
41
40
|
return false;
|
|
42
41
|
}
|
|
43
42
|
},
|
|
44
|
-
async getSuggestions(
|
|
43
|
+
async getSuggestions(value) {
|
|
45
44
|
try {
|
|
46
45
|
state.loading = true;
|
|
47
46
|
state.suggestions = [];
|
|
48
|
-
const response = await BlockchainApiController.getEnsNameSuggestions(
|
|
47
|
+
const response = await BlockchainApiController.getEnsNameSuggestions(value);
|
|
49
48
|
state.suggestions =
|
|
50
49
|
response.suggestions.map(suggestion => ({
|
|
51
50
|
...suggestion,
|
|
52
|
-
name: suggestion.name
|
|
51
|
+
name: suggestion.name
|
|
53
52
|
})) || [];
|
|
54
53
|
return state.suggestions;
|
|
55
54
|
}
|
|
@@ -63,7 +62,7 @@ export const EnsController = {
|
|
|
63
62
|
},
|
|
64
63
|
async getNamesForAddress(address) {
|
|
65
64
|
try {
|
|
66
|
-
const network =
|
|
65
|
+
const network = ChainController.state.activeCaipNetwork;
|
|
67
66
|
if (!network) {
|
|
68
67
|
return [];
|
|
69
68
|
}
|
|
@@ -76,7 +75,7 @@ export const EnsController = {
|
|
|
76
75
|
}
|
|
77
76
|
},
|
|
78
77
|
async registerName(name) {
|
|
79
|
-
const network =
|
|
78
|
+
const network = ChainController.state.activeCaipNetwork;
|
|
80
79
|
if (!network) {
|
|
81
80
|
throw new Error('Network not found');
|
|
82
81
|
}
|
|
@@ -88,9 +87,9 @@ export const EnsController = {
|
|
|
88
87
|
state.loading = true;
|
|
89
88
|
try {
|
|
90
89
|
const message = JSON.stringify({
|
|
91
|
-
name
|
|
90
|
+
name,
|
|
92
91
|
attributes: {},
|
|
93
|
-
timestamp: Math.floor(Date.now()
|
|
92
|
+
timestamp: Math.floor(Date.now())
|
|
94
93
|
});
|
|
95
94
|
RouterController.pushTransactionStack({
|
|
96
95
|
view: 'RegisterAccountNameSuccess',
|
|
@@ -112,7 +111,7 @@ export const EnsController = {
|
|
|
112
111
|
signature,
|
|
113
112
|
message
|
|
114
113
|
});
|
|
115
|
-
AccountController.setProfileName(
|
|
114
|
+
AccountController.setProfileName(name, network.chainNamespace);
|
|
116
115
|
RouterController.replace('RegisterAccountNameSuccess');
|
|
117
116
|
}
|
|
118
117
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnsController.js","sourceRoot":"","sources":["../../../../src/controllers/EnsController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,IAAI,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,EAAE,KAAK,EAAE,SAAS,IAAI,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AAEtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"EnsController.js","sourceRoot":"","sources":["../../../../src/controllers/EnsController.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ export const EventsController = {
|
|
|
24
24
|
const { projectId, sdkType, sdkVersion } = OptionsController.state;
|
|
25
25
|
return {
|
|
26
26
|
'x-project-id': projectId,
|
|
27
|
-
'x-sdk-type': sdkType
|
|
27
|
+
'x-sdk-type': sdkType,
|
|
28
28
|
'x-sdk-version': sdkVersion || 'html-wagmi-4.2.2'
|
|
29
29
|
};
|
|
30
30
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventsController.js","sourceRoot":"","sources":["../../../../src/controllers/EventsController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,IAAI,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAE1D,4DAA4D;AAC5D,MAAM,OAAO,GAAG,cAAc,CAAC,eAAe,EAAE,CAAA;AAChD,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;AACtD,MAAM,QAAQ,GAAG,CAAC,eAAe,CAAC,CAAA;AAQlC,4DAA4D;AAC5D,MAAM,KAAK,GAAG,KAAK,CAAwB;IACzC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;IACrB,IAAI,EAAE;QACJ,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,eAAe;KACvB;CACF,CAAC,CAAA;AAEF,4DAA4D;AAC5D,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,KAAK;IAEL,SAAS,CAAC,QAAmD;QAC3D,OAAO,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;IAC1C,CAAC;IAED,cAAc;QACZ,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,iBAAiB,CAAC,KAAK,CAAA;QAElE,OAAO;YACL,cAAc,EAAE,SAAS;YACzB,YAAY,EAAE,OAAO
|
|
1
|
+
{"version":3,"file":"EventsController.js","sourceRoot":"","sources":["../../../../src/controllers/EventsController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,IAAI,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAE1D,4DAA4D;AAC5D,MAAM,OAAO,GAAG,cAAc,CAAC,eAAe,EAAE,CAAA;AAChD,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;AACtD,MAAM,QAAQ,GAAG,CAAC,eAAe,CAAC,CAAA;AAQlC,4DAA4D;AAC5D,MAAM,KAAK,GAAG,KAAK,CAAwB;IACzC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;IACrB,IAAI,EAAE;QACJ,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,eAAe;KACvB;CACF,CAAC,CAAA;AAEF,4DAA4D;AAC5D,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,KAAK;IAEL,SAAS,CAAC,QAAmD;QAC3D,OAAO,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;IAC1C,CAAC;IAED,cAAc;QACZ,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,iBAAiB,CAAC,KAAK,CAAA;QAElE,OAAO;YACL,cAAc,EAAE,SAAS;YACzB,YAAY,EAAE,OAAO;YACrB,eAAe,EAAE,UAAU,IAAI,kBAAkB;SAClD,CAAA;IACH,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,OAA8B;QACtD,IAAI,CAAC;YACH,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;gBAC3E,OAAM;YACR,CAAC;YACD,MAAM,GAAG,CAAC,IAAI,CAAC;gBACb,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,gBAAgB,CAAC,cAAc,EAAE;gBAC1C,IAAI,EAAE;oBACJ,OAAO,EAAE,cAAc,CAAC,OAAO,EAAE;oBACjC,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI;oBACzB,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ;oBAChC,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,KAAK,EAAE,OAAO,CAAC,IAAI;iBACpB;aACF,CAAC,CAAA;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,iBAAiB;QACnB,CAAC;IACH,CAAC;IAED,SAAS,CAAC,IAAmC;QAC3C,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC5B,KAAK,CAAC,IAAI,GAAG,IAAI,CAAA;QACjB,IAAI,iBAAiB,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;YAC/C,gBAAgB,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC;CACF,CAAA"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { subscribeKey as subKey } from 'valtio/vanilla/utils';
|
|
2
2
|
import { proxy, subscribe as sub } from 'valtio/vanilla';
|
|
3
|
-
import { AccountController } from './AccountController.js';
|
|
4
3
|
import { ApiController } from './ApiController.js';
|
|
5
4
|
import { EventsController } from './EventsController.js';
|
|
6
5
|
import { PublicStateController } from './PublicStateController.js';
|
|
@@ -24,12 +23,12 @@ export const ModalController = {
|
|
|
24
23
|
},
|
|
25
24
|
async open(options) {
|
|
26
25
|
await ApiController.state.prefetchPromise;
|
|
27
|
-
const
|
|
26
|
+
const caipAddress = ChainController.state.activeCaipAddress;
|
|
28
27
|
const noAdapters = ChainController.state.noAdapters;
|
|
29
28
|
if (options?.view) {
|
|
30
29
|
RouterController.reset(options.view);
|
|
31
30
|
}
|
|
32
|
-
else if (
|
|
31
|
+
else if (caipAddress) {
|
|
33
32
|
RouterController.reset('Account');
|
|
34
33
|
}
|
|
35
34
|
else if (noAdapters && !CoreHelperUtil.isMobile()) {
|
|
@@ -43,11 +42,11 @@ export const ModalController = {
|
|
|
43
42
|
EventsController.sendEvent({
|
|
44
43
|
type: 'track',
|
|
45
44
|
event: 'MODAL_OPEN',
|
|
46
|
-
properties: { connected }
|
|
45
|
+
properties: { connected: Boolean(caipAddress) }
|
|
47
46
|
});
|
|
48
47
|
},
|
|
49
48
|
close() {
|
|
50
|
-
const connected =
|
|
49
|
+
const connected = Boolean(ChainController.state.activeCaipAddress);
|
|
51
50
|
state.open = false;
|
|
52
51
|
PublicStateController.set({ open: false });
|
|
53
52
|
EventsController.sendEvent({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModalController.js","sourceRoot":"","sources":["../../../../src/controllers/ModalController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,IAAI,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,EAAE,KAAK,EAAE,SAAS,IAAI,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACxD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ModalController.js","sourceRoot":"","sources":["../../../../src/controllers/ModalController.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,12 +56,6 @@ export const NetworkController = {
|
|
|
56
56
|
return;
|
|
57
57
|
}
|
|
58
58
|
ChainController.setActiveCaipNetwork(caipNetwork);
|
|
59
|
-
ChainController.setChainNetworkData(caipNetwork.chainNamespace, { caipNetwork });
|
|
60
|
-
PublicStateController.set({
|
|
61
|
-
activeChain: caipNetwork.chainNamespace,
|
|
62
|
-
selectedNetworkId: caipNetwork?.id
|
|
63
|
-
});
|
|
64
|
-
SafeLocalStorage.setItem(SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK, JSON.stringify(caipNetwork));
|
|
65
59
|
const isSupported = this.checkIfSupportedNetwork();
|
|
66
60
|
if (!isSupported) {
|
|
67
61
|
this.showUnsupportedChainUI();
|
|
@@ -183,8 +177,8 @@ export const NetworkController = {
|
|
|
183
177
|
if (!chain) {
|
|
184
178
|
return false;
|
|
185
179
|
}
|
|
186
|
-
const activeCaipNetwork = ChainController.state.
|
|
187
|
-
const requestedCaipNetworks = this.getRequestedCaipNetworks();
|
|
180
|
+
const activeCaipNetwork = ChainController.state.activeCaipNetwork;
|
|
181
|
+
const requestedCaipNetworks = this.getRequestedCaipNetworks(chain);
|
|
188
182
|
if (!requestedCaipNetworks.length) {
|
|
189
183
|
return true;
|
|
190
184
|
}
|
|
@@ -229,8 +223,8 @@ export const NetworkController = {
|
|
|
229
223
|
}, 300);
|
|
230
224
|
},
|
|
231
225
|
getActiveNetworkTokenAddress() {
|
|
232
|
-
const address = ConstantsUtil.NATIVE_TOKEN_ADDRESS[
|
|
233
|
-
return `${
|
|
226
|
+
const address = ConstantsUtil.NATIVE_TOKEN_ADDRESS[ChainController.state.activeCaipNetwork?.chainNamespace || 'eip155'];
|
|
227
|
+
return `${ChainController.state.activeCaipNetwork?.id || 'eip155:1'}:${address}`;
|
|
234
228
|
}
|
|
235
229
|
};
|
|
236
230
|
//# sourceMappingURL=NetworkController.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkController.js","sourceRoot":"","sources":["../../../../src/controllers/NetworkController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EACL,WAAW,EACX,gBAAgB,EAChB,oBAAoB,EAIrB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAuBzD,4DAA4D;AAC5D,MAAM,KAAK,GAAG,KAAK,CAAyB;IAC1C,mBAAmB,EAAE,IAAI;IACzB,oBAAoB,EAAE,KAAK;IAC3B,2BAA2B,EAAE,EAAE;CAChC,CAAC,CAAA;AAEF,4DAA4D;AAC5D,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,KAAK;IAEL,YAAY,CAAC,QAA4C;QACvD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAM;QACR,CAAC;QAED,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAA;IACrC,CAAC;IAED,YAAY,CACV,QAAW,EACX,QAAkD;QAElD,IAAI,IAAI,GAA0C,SAAS,CAAA;QAE3D,OAAO,eAAe,CAAC,kBAAkB,CAAC,cAAc,EAAE,YAAY,CAAC,EAAE;YACvE,IAAI,YAAY,EAAE,CAAC;gBACjB,MAAM,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;gBACxC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;oBACvB,IAAI,GAAG,SAAS,CAAA;oBAChB,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACrB,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,UAAU;QACR,OAAO,eAAe,CAAC,0BAA0B,EAAE,CAAA;IACrD,CAAC;IAED,wBAAwB;QACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAA;QAEhD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;QAClC,CAAC;IACH,CAAC;IAED,qBAAqB,CAAC,WAAkD;QACtE,IAAI,WAAW,EAAE,CAAC;YAChB,eAAe,CAAC,cAAc,CAAC,WAAW,CAAC,cAAc,EAAE,WAAW,CAAC,CAAA;YACvE,eAAe,CAAC,mBAAmB,CAAC,WAAW,CAAC,cAAc,EAAE;gBAC9D,oBAAoB,EAAE,IAAI;aAC3B,CAAC,CAAA;YACF,qBAAqB,CAAC,GAAG,CAAC,EAAE,iBAAiB,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC,CAAA;QAClE,CAAC;IACH,CAAC;IAED,oBAAoB,CAAC,WAAkD;QACrE,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAM;QACR,CAAC;QAED,eAAe,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"NetworkController.js","sourceRoot":"","sources":["../../../../src/controllers/NetworkController.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import { subscribeKey as subKey } from 'valtio/vanilla/utils';
|
|
2
2
|
import { proxy } from 'valtio/vanilla';
|
|
3
|
-
import { ApiController } from './ApiController.js';
|
|
4
3
|
import { ConstantsUtil } from '../utils/ConstantsUtil.js';
|
|
5
4
|
// -- State --------------------------------------------- //
|
|
6
5
|
const state = proxy({
|
|
7
6
|
features: ConstantsUtil.DEFAULT_FEATURES,
|
|
8
7
|
projectId: '',
|
|
9
|
-
sdkType: '
|
|
8
|
+
sdkType: 'appkit',
|
|
10
9
|
sdkVersion: 'html-wagmi-undefined'
|
|
11
10
|
});
|
|
12
11
|
// -- Controller ---------------------------------------- //
|
|
@@ -40,9 +39,6 @@ export const OptionsController = {
|
|
|
40
39
|
},
|
|
41
40
|
setExcludeWalletIds(excludeWalletIds) {
|
|
42
41
|
state.excludeWalletIds = excludeWalletIds;
|
|
43
|
-
if (excludeWalletIds) {
|
|
44
|
-
ApiController.searchWalletByIds({ ids: excludeWalletIds });
|
|
45
|
-
}
|
|
46
42
|
},
|
|
47
43
|
setFeaturedWalletIds(featuredWalletIds) {
|
|
48
44
|
state.featuredWalletIds = featuredWalletIds;
|
|
@@ -77,6 +73,12 @@ export const OptionsController = {
|
|
|
77
73
|
setEIP6963Enabled(enableEIP6963) {
|
|
78
74
|
state.enableEIP6963 = enableEIP6963;
|
|
79
75
|
},
|
|
76
|
+
setEnableWalletConnect(enableWalletConnect) {
|
|
77
|
+
state.enableWalletConnect = enableWalletConnect;
|
|
78
|
+
},
|
|
79
|
+
setEnableWallets(enableWallets) {
|
|
80
|
+
state.enableWallets = enableWallets;
|
|
81
|
+
},
|
|
80
82
|
setHasMultipleAddresses(hasMultipleAddresses) {
|
|
81
83
|
state.hasMultipleAddresses = hasMultipleAddresses;
|
|
82
84
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OptionsController.js","sourceRoot":"","sources":["../../../../src/controllers/OptionsController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,IAAI,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAStC,OAAO,EAAE,aAAa,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"OptionsController.js","sourceRoot":"","sources":["../../../../src/controllers/OptionsController.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,9 +8,8 @@ import { ConnectionController } from './ConnectionController.js';
|
|
|
8
8
|
import { SnackController } from './SnackController.js';
|
|
9
9
|
import { CoreHelperUtil } from '../utils/CoreHelperUtil.js';
|
|
10
10
|
import { EventsController } from './EventsController.js';
|
|
11
|
-
import { NetworkController } from './NetworkController.js';
|
|
12
|
-
import { ChainController } from './ChainController.js';
|
|
13
11
|
import { W3mFrameRpcConstants } from '@reown/appkit-wallet';
|
|
12
|
+
import { ChainController } from './ChainController.js';
|
|
14
13
|
// -- State --------------------------------------------- //
|
|
15
14
|
const state = proxy({
|
|
16
15
|
loading: false
|
|
@@ -72,7 +71,7 @@ export const SendController = {
|
|
|
72
71
|
W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT,
|
|
73
72
|
token: this.state.token.address,
|
|
74
73
|
amount: this.state.sendTokenAmount,
|
|
75
|
-
network:
|
|
74
|
+
network: ChainController.state.activeCaipNetwork?.id || ''
|
|
76
75
|
}
|
|
77
76
|
});
|
|
78
77
|
this.sendERC20Token({
|
|
@@ -94,7 +93,7 @@ export const SendController = {
|
|
|
94
93
|
W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT,
|
|
95
94
|
token: this.state.token?.symbol,
|
|
96
95
|
amount: this.state.sendTokenAmount,
|
|
97
|
-
network:
|
|
96
|
+
network: ChainController.state.activeCaipNetwork?.id || ''
|
|
98
97
|
}
|
|
99
98
|
});
|
|
100
99
|
this.sendNativeToken({
|
|
@@ -131,7 +130,7 @@ export const SendController = {
|
|
|
131
130
|
W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT,
|
|
132
131
|
token: this.state.token?.symbol || '',
|
|
133
132
|
amount: params.sendTokenAmount,
|
|
134
|
-
network:
|
|
133
|
+
network: ChainController.state.activeCaipNetwork?.id || ''
|
|
135
134
|
}
|
|
136
135
|
});
|
|
137
136
|
this.resetSend();
|
|
@@ -145,7 +144,7 @@ export const SendController = {
|
|
|
145
144
|
W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT,
|
|
146
145
|
token: this.state.token?.symbol || '',
|
|
147
146
|
amount: params.sendTokenAmount,
|
|
148
|
-
network:
|
|
147
|
+
network: ChainController.state.activeCaipNetwork?.id || ''
|
|
149
148
|
}
|
|
150
149
|
});
|
|
151
150
|
SnackController.showError('Something went wrong');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SendController.js","sourceRoot":"","sources":["../../../../src/controllers/SendController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,IAAI,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,IAAI,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAC7D,OAAO,EAAkC,MAAM,sBAAsB,CAAA;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"SendController.js","sourceRoot":"","sources":["../../../../src/controllers/SendController.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ import { SwapApiUtil } from '../utils/SwapApiUtil.js';
|
|
|
7
7
|
import { SnackController } from './SnackController.js';
|
|
8
8
|
import { RouterController } from './RouterController.js';
|
|
9
9
|
import { NumberUtil } from '@reown/appkit-common';
|
|
10
|
-
import { NetworkController } from './NetworkController.js';
|
|
11
10
|
import { CoreHelperUtil } from '../utils/CoreHelperUtil.js';
|
|
12
11
|
import { BlockchainApiController } from './BlockchainApiController.js';
|
|
13
12
|
import { OptionsController } from './OptionsController.js';
|
|
@@ -15,6 +14,8 @@ import { SwapCalculationUtil } from '../utils/SwapCalculationUtil.js';
|
|
|
15
14
|
import { EventsController } from './EventsController.js';
|
|
16
15
|
import { W3mFrameRpcConstants } from '@reown/appkit-wallet';
|
|
17
16
|
import { StorageUtil } from '../utils/StorageUtil.js';
|
|
17
|
+
import { ChainController } from './ChainController.js';
|
|
18
|
+
import { NetworkController } from './NetworkController.js';
|
|
18
19
|
// -- Constants ---------------------------------------- //
|
|
19
20
|
export const INITIAL_GAS_LIMIT = 150000;
|
|
20
21
|
export const TO_AMOUNT_DECIMALS = 6;
|
|
@@ -79,13 +80,13 @@ export const SwapController = {
|
|
|
79
80
|
return subKey(state, key, callback);
|
|
80
81
|
},
|
|
81
82
|
getParams() {
|
|
82
|
-
const
|
|
83
|
+
const caipAddress = ChainController.state.activeCaipAddress;
|
|
84
|
+
const address = CoreHelperUtil.getPlainAddress(caipAddress);
|
|
83
85
|
const networkAddress = NetworkController.getActiveNetworkTokenAddress();
|
|
84
86
|
const type = StorageUtil.getConnectedConnector();
|
|
85
87
|
if (!address) {
|
|
86
88
|
throw new Error('No address found to swap the tokens from.');
|
|
87
89
|
}
|
|
88
|
-
const caipAddress = AccountController.state.caipAddress;
|
|
89
90
|
const invalidToToken = !state.toToken?.address || !state.toToken?.decimals;
|
|
90
91
|
const invalidSourceToken = !state.sourceToken?.address ||
|
|
91
92
|
!state.sourceToken?.decimals ||
|
|
@@ -94,7 +95,7 @@ export const SwapController = {
|
|
|
94
95
|
return {
|
|
95
96
|
networkAddress,
|
|
96
97
|
fromAddress: address,
|
|
97
|
-
fromCaipAddress:
|
|
98
|
+
fromCaipAddress: caipAddress,
|
|
98
99
|
sourceTokenAddress: state.sourceToken?.address,
|
|
99
100
|
toTokenAddress: state.toToken?.address,
|
|
100
101
|
toTokenAmount: state.toTokenAmount,
|
|
@@ -287,7 +288,7 @@ export const SwapController = {
|
|
|
287
288
|
},
|
|
288
289
|
setBalances(balances) {
|
|
289
290
|
const { networkAddress } = this.getParams();
|
|
290
|
-
const caipNetwork =
|
|
291
|
+
const caipNetwork = ChainController.state.activeCaipNetwork;
|
|
291
292
|
if (!caipNetwork) {
|
|
292
293
|
return;
|
|
293
294
|
}
|
|
@@ -564,7 +565,7 @@ export const SwapController = {
|
|
|
564
565
|
type: 'track',
|
|
565
566
|
event: 'SWAP_SUCCESS',
|
|
566
567
|
properties: {
|
|
567
|
-
network:
|
|
568
|
+
network: ChainController.state.activeCaipNetwork?.id || '',
|
|
568
569
|
swapFromToken: this.state.sourceToken?.symbol || '',
|
|
569
570
|
swapToToken: this.state.toToken?.symbol || '',
|
|
570
571
|
swapFromAmount: this.state.sourceTokenAmount || '',
|
|
@@ -589,7 +590,7 @@ export const SwapController = {
|
|
|
589
590
|
type: 'track',
|
|
590
591
|
event: 'SWAP_ERROR',
|
|
591
592
|
properties: {
|
|
592
|
-
network:
|
|
593
|
+
network: ChainController.state.activeCaipNetwork?.id || '',
|
|
593
594
|
swapFromToken: this.state.sourceToken?.symbol || '',
|
|
594
595
|
swapToToken: this.state.toToken?.symbol || '',
|
|
595
596
|
swapFromAmount: this.state.sourceTokenAmount || '',
|