@thirdweb-dev/wagmi-adapter 0.2.187 → 0.2.189
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/cjs/connector.js +12 -6
- package/dist/cjs/connector.js.map +1 -1
- package/dist/esm/connector.js +13 -7
- package/dist/esm/connector.js.map +1 -1
- package/dist/types/connector.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/connector.ts +23 -14
package/dist/cjs/connector.js
CHANGED
|
@@ -6,6 +6,7 @@ const thirdweb_1 = require("thirdweb");
|
|
|
6
6
|
const wallets_1 = require("thirdweb/wallets");
|
|
7
7
|
const activeWalletIdKey = "thirdweb:active-wallet-id";
|
|
8
8
|
const connectedWalletIdsKey = "thirdweb:connected-wallet-ids";
|
|
9
|
+
const activeChainIdKey = "thirdweb:active-chain";
|
|
9
10
|
/**
|
|
10
11
|
* Connect to an in-app wallet using the auth strategy of your choice.
|
|
11
12
|
* @param args - Options for the in-app wallet connection.
|
|
@@ -64,8 +65,11 @@ function inAppWalletConnector(args) {
|
|
|
64
65
|
connect: async (params) => {
|
|
65
66
|
wallet =
|
|
66
67
|
params && "wallet" in params ? params.wallet : wallet;
|
|
67
|
-
const lastChainIdStr =
|
|
68
|
-
const
|
|
68
|
+
const lastChainIdStr = rawStorage?.getItem(activeChainIdKey);
|
|
69
|
+
const lastChain = lastChainIdStr
|
|
70
|
+
? JSON.parse(lastChainIdStr)
|
|
71
|
+
: undefined;
|
|
72
|
+
const lastChainId = lastChain ? lastChain.id : undefined;
|
|
69
73
|
if (params?.isReconnecting) {
|
|
70
74
|
const { autoConnect } = await Promise.resolve().then(() => require("thirdweb/wallets"));
|
|
71
75
|
const chainId = lastChainId || args.smartAccount?.chain?.id || 1;
|
|
@@ -124,9 +128,11 @@ function inAppWalletConnector(args) {
|
|
|
124
128
|
}
|
|
125
129
|
rawStorage.setItem(activeWalletIdKey, wallet.id);
|
|
126
130
|
}
|
|
127
|
-
await config.storage?.setItem("thirdweb:lastChainId", chain.id);
|
|
128
131
|
args.onConnect?.(wallet);
|
|
129
|
-
return {
|
|
132
|
+
return {
|
|
133
|
+
accounts: [(0, thirdweb_1.getAddress)(account.address)],
|
|
134
|
+
chainId: chain.id,
|
|
135
|
+
};
|
|
130
136
|
},
|
|
131
137
|
disconnect: async () => {
|
|
132
138
|
await wallet.disconnect();
|
|
@@ -142,7 +148,7 @@ function inAppWalletConnector(args) {
|
|
|
142
148
|
return wallet.getChain()?.id || 1;
|
|
143
149
|
},
|
|
144
150
|
getProvider: async (params) => {
|
|
145
|
-
const lastChainIdStr = await
|
|
151
|
+
const lastChainIdStr = await rawStorage?.getItem(activeChainIdKey);
|
|
146
152
|
const lastChainId = lastChainIdStr ? Number(lastChainIdStr) : undefined;
|
|
147
153
|
const chain = (0, thirdweb_1.defineChain)(params?.chainId || args.smartAccount?.chain?.id || lastChainId || 1);
|
|
148
154
|
if (!wallet.getAccount()) {
|
|
@@ -191,7 +197,7 @@ function inAppWalletConnector(args) {
|
|
|
191
197
|
config.emitter.emit("change", {
|
|
192
198
|
chainId: chain.id,
|
|
193
199
|
});
|
|
194
|
-
|
|
200
|
+
rawStorage?.setItem(activeChainIdKey, JSON.stringify((0, thirdweb_1.defineChain)(chain.id)));
|
|
195
201
|
return chain;
|
|
196
202
|
},
|
|
197
203
|
type: "in-app",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../../src/connector.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../../src/connector.ts"],"names":[],"mappings":";;AA4GA,oDA0KC;AAtRD,sCAAsE;AAEtE,uCAKkB;AAClB,8CAS0B;AAyC1B,MAAM,iBAAiB,GAAG,2BAA2B,CAAC;AACtD,MAAM,qBAAqB,GAAG,+BAA+B,CAAC;AAC9D,MAAM,gBAAgB,GAAG,uBAAuB,CAAC;AAEjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AACH,SAAgB,oBAAoB,CAClC,IAA2B;IAE3B,IAAI,MAAM,GAAW,IAAI,CAAC,WAAW;QACnC,CAAC,CAAC,IAAA,yBAAe,EAAC,IAAI,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;QAClE,CAAC,CAAC,IAAA,qBAAmB,EAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,MAAM,UAAU,GACd,OAAO,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,YAAY;QAClD,CAAC,CAAC,MAAM,CAAC,YAAY;QACrB,CAAC,CAAC,SAAS,CAAC;IAChB,OAAO,IAAA,sBAAe,EAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAClC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YACxB,MAAM;gBACJ,MAAM,IAAI,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAE,MAAM,CAAC,MAAiB,CAAC,CAAC,CAAC,MAAM,CAAC;YACpE,MAAM,cAAc,GAAG,UAAU,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;YAC7D,MAAM,SAAS,GAAG,cAAc;gBAC9B,CAAC,CAAE,IAAI,CAAC,KAAK,CAAC,cAAc,CAAW;gBACvC,CAAC,CAAC,SAAS,CAAC;YACd,MAAM,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YACzD,IAAI,MAAM,EAAE,cAAc,EAAE,CAAC;gBAC3B,MAAM,EAAE,WAAW,EAAE,GAAG,2CAAa,kBAAkB,EAAC,CAAC;gBACzD,MAAM,OAAO,GAAG,WAAW,IAAI,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC;gBACjE,MAAM,WAAW,CAAC;oBAChB,KAAK,EAAE,IAAA,sBAAW,EAAC,OAAO,CAAC;oBAC3B,MAAM;oBACN,OAAO,EAAE,CAAC,MAAM,CAAC;oBACjB,SAAS,EAAE,IAAI,CAAC,SAAS;iBAC1B,CAAC,CAAC;gBAEH,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;gBACpC,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAChD,CAAC;gBACD,OAAO;oBACL,QAAQ,EAAE,CAAC,IAAA,qBAAU,EAAC,OAAO,CAAC,OAAO,CAAC,CAAQ;oBAC9C,OAAO,EAAE,OAAO;iBACjB,CAAC;YACJ,CAAC;YAED,yDAAyD;YACzD,MAAM,uBAAuB,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;YACpD,IAAI,uBAAuB,EAAE,CAAC;gBAC5B,OAAO;oBACL,QAAQ,EAAE,CAAC,IAAA,qBAAU,EAAC,uBAAuB,CAAC,OAAO,CAAC,CAAQ;oBAC9D,OAAO,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,CAAC;iBACpC,CAAC;YACJ,CAAC;YAED,gCAAgC;YAChC,MAAM,YAAY,GAAG,MAAM,IAAI,UAAU,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;YACzE,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CACb,+EAA+E,CAChF,CAAC;YACJ,CAAC;YACD,MAAM,KAAK,GAAG,IAAA,sBAAW,EACvB,YAAY,EAAE,OAAO;gBACnB,WAAW;gBACX,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE;gBAC5B,CAAC,CACJ,CAAC;YACF,MAAM,gBAAgB,GAAG;gBACvB,GAAG,YAAY;gBACf,KAAK;gBACL,MAAM;aACyB,CAAC;YAElC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;YACvD,qDAAqD;YACrD,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,kBAAkB,GAAG,UAAU,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;gBACtE,IAAI,kBAAkB,EAAE,CAAC;oBACvB,MAAM,uBAAuB,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;oBAC/D,IAAI,KAAK,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAAE,CAAC;wBAC3C,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;4BACjD,uBAAuB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;4BACxC,UAAU,CAAC,OAAO,CAChB,qBAAqB,EACrB,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,CACxC,CAAC;wBACJ,CAAC;oBACH,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,UAAU,CAAC,OAAO,CAChB,qBAAqB,EACrB,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAC5B,CAAC;gBACJ,CAAC;gBACD,UAAU,CAAC,OAAO,CAAC,iBAAiB,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;YACnD,CAAC;YACD,IAAI,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,CAAC;YACzB,OAAO;gBACL,QAAQ,EAAE,CAAC,IAAA,qBAAU,EAAC,OAAO,CAAC,OAAO,CAAC,CAAQ;gBAC9C,OAAO,EAAE,KAAK,CAAC,EAAE;aAClB,CAAC;QACJ,CAAC;QACD,UAAU,EAAE,KAAK,IAAI,EAAE;YACrB,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;QAC5B,CAAC;QACD,WAAW,EAAE,KAAK,IAAI,EAAE;YACtB,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;YACpC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;YAC1C,CAAC;YACD,OAAO,CAAC,IAAA,qBAAU,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACvC,CAAC;QACD,UAAU,EAAE,KAAK,IAAI,EAAE;YACrB,OAAO,MAAM,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QACpC,CAAC;QACD,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YAC5B,MAAM,cAAc,GAAG,MAAM,UAAU,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;YACnE,MAAM,WAAW,GAAG,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACxE,MAAM,KAAK,GAAG,IAAA,sBAAW,EACvB,MAAM,EAAE,OAAO,IAAI,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE,IAAI,WAAW,IAAI,CAAC,CACpE,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;gBACzB,MAAM,EAAE,WAAW,EAAE,GAAG,2CAAa,kBAAkB,EAAC,CAAC;gBACzD,MAAM,WAAW,CAAC;oBAChB,KAAK;oBACL,MAAM;oBACN,OAAO,EAAE,CAAC,MAAM,CAAC;oBACjB,SAAS,EAAE,IAAI,CAAC,SAAS;iBAC1B,CAAC,CAAC;YACL,CAAC;YACD,OAAO,iBAAO,CAAC,UAAU,CAAC;gBACxB,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI,KAAK;gBACjC,MAAM;gBACN,MAAM;aACP,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI;QACzB,EAAE,EAAE,eAAe;QACnB,YAAY,EAAE,KAAK,IAAI,EAAE;YACvB,MAAM,kBAAkB,GAAG,UAAU,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;YACtE,IAAI,kBAAkB,EAAE,CAAC;gBACvB,MAAM,uBAAuB,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;gBAC/D,IAAI,uBAAuB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;oBAChD,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,IAAI,eAAe;QAC5C,iBAAiB,EAAE,GAAG,EAAE;YACtB,QAAQ;QACV,CAAC,EAAE,0BAA0B;QAC7B,cAAc,EAAE,GAAG,EAAE;YACnB,QAAQ;QACV,CAAC;QACD,YAAY,EAAE,GAAG,EAAE;YACjB,QAAQ;QACV,CAAC;QACD,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,OAAO,CAAC,CAAC;YACjE,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,CAAC,SAAS,MAAM,CAAC,OAAO,iBAAiB,CAAC,CAAC;YAC5D,CAAC;YACD,MAAM,MAAM,CAAC,WAAW,CAAC,IAAA,sBAAW,EAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;YAChD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAC5B,OAAO,EAAE,KAAK,CAAC,EAAE;aAClB,CAAC,CAAC;YACH,UAAU,EAAE,OAAO,CACjB,gBAAgB,EAChB,IAAI,CAAC,SAAS,CAAC,IAAA,sBAAW,EAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CACtC,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,EAAE,QAAQ;KACf,CAAC,CAAC,CAAC;AACN,CAAC"}
|
package/dist/esm/connector.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { createConnector } from "@wagmi/core";
|
|
2
|
-
import { defineChain, getAddress } from "thirdweb";
|
|
2
|
+
import { defineChain, getAddress, } from "thirdweb";
|
|
3
3
|
import { EIP1193, ecosystemWallet, inAppWallet as thirdwebInAppWallet, } from "thirdweb/wallets";
|
|
4
4
|
const activeWalletIdKey = "thirdweb:active-wallet-id";
|
|
5
5
|
const connectedWalletIdsKey = "thirdweb:connected-wallet-ids";
|
|
6
|
+
const activeChainIdKey = "thirdweb:active-chain";
|
|
6
7
|
/**
|
|
7
8
|
* Connect to an in-app wallet using the auth strategy of your choice.
|
|
8
9
|
* @param args - Options for the in-app wallet connection.
|
|
@@ -61,8 +62,11 @@ export function inAppWalletConnector(args) {
|
|
|
61
62
|
connect: async (params) => {
|
|
62
63
|
wallet =
|
|
63
64
|
params && "wallet" in params ? params.wallet : wallet;
|
|
64
|
-
const lastChainIdStr =
|
|
65
|
-
const
|
|
65
|
+
const lastChainIdStr = rawStorage?.getItem(activeChainIdKey);
|
|
66
|
+
const lastChain = lastChainIdStr
|
|
67
|
+
? JSON.parse(lastChainIdStr)
|
|
68
|
+
: undefined;
|
|
69
|
+
const lastChainId = lastChain ? lastChain.id : undefined;
|
|
66
70
|
if (params?.isReconnecting) {
|
|
67
71
|
const { autoConnect } = await import("thirdweb/wallets");
|
|
68
72
|
const chainId = lastChainId || args.smartAccount?.chain?.id || 1;
|
|
@@ -121,9 +125,11 @@ export function inAppWalletConnector(args) {
|
|
|
121
125
|
}
|
|
122
126
|
rawStorage.setItem(activeWalletIdKey, wallet.id);
|
|
123
127
|
}
|
|
124
|
-
await config.storage?.setItem("thirdweb:lastChainId", chain.id);
|
|
125
128
|
args.onConnect?.(wallet);
|
|
126
|
-
return {
|
|
129
|
+
return {
|
|
130
|
+
accounts: [getAddress(account.address)],
|
|
131
|
+
chainId: chain.id,
|
|
132
|
+
};
|
|
127
133
|
},
|
|
128
134
|
disconnect: async () => {
|
|
129
135
|
await wallet.disconnect();
|
|
@@ -139,7 +145,7 @@ export function inAppWalletConnector(args) {
|
|
|
139
145
|
return wallet.getChain()?.id || 1;
|
|
140
146
|
},
|
|
141
147
|
getProvider: async (params) => {
|
|
142
|
-
const lastChainIdStr = await
|
|
148
|
+
const lastChainIdStr = await rawStorage?.getItem(activeChainIdKey);
|
|
143
149
|
const lastChainId = lastChainIdStr ? Number(lastChainIdStr) : undefined;
|
|
144
150
|
const chain = defineChain(params?.chainId || args.smartAccount?.chain?.id || lastChainId || 1);
|
|
145
151
|
if (!wallet.getAccount()) {
|
|
@@ -188,7 +194,7 @@ export function inAppWalletConnector(args) {
|
|
|
188
194
|
config.emitter.emit("change", {
|
|
189
195
|
chainId: chain.id,
|
|
190
196
|
});
|
|
191
|
-
|
|
197
|
+
rawStorage?.setItem(activeChainIdKey, JSON.stringify(defineChain(chain.id)));
|
|
192
198
|
return chain;
|
|
193
199
|
},
|
|
194
200
|
type: "in-app",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../../src/connector.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,eAAe,EAAE,MAAM,aAAa,CAAC;AAEtE,OAAO,
|
|
1
|
+
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../../src/connector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector.d.ts","sourceRoot":"","sources":["../../src/connector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAmB,MAAM,aAAa,CAAC;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,
|
|
1
|
+
{"version":3,"file":"connector.d.ts","sourceRoot":"","sources":["../../src/connector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAmB,MAAM,aAAa,CAAC;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,OAAO,EAGP,KAAK,0BAA0B,EAC/B,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAE3B,KAAK,MAAM,EACZ,MAAM,kBAAkB,CAAC;AAE1B,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAC1C,0BAA0B,GAAG;IAC3B,MAAM,EAAE,cAAc,CAAC;IACvB,WAAW,CAAC,EAAE,aAAa,MAAM,EAAE,CAAC;IACpC,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;CACtC,CACF,CAAC;AACF,MAAM,MAAM,oBAAoB,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAC3E,KAAK,qBAAqB,CAAC,gBAAgB,SAAS,OAAO,GAAG,KAAK,IAAI;IACrE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,OAAO,GAAG,SAAS,CAAC;CAC3D,CAAC;AACF,MAAM,MAAM,iBAAiB,CAAC,gBAAgB,SAAS,OAAO,GAAG,KAAK,IAClE,CAAC,qBAAqB,GAAG,qBAAqB,CAAC,gBAAgB,CAAC,CAAC,GACjE,CAAC,sBAAsB,GAAG,qBAAqB,CAAC,gBAAgB,CAAC,CAAC,GAClE,CAAC;IACC,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,qBAAqB,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAEjD,KAAK,QAAQ,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;AACpD,KAAK,UAAU,GAAG;IAChB,OAAO,CAAC,gBAAgB,SAAS,OAAO,GAAG,KAAK,EAC9C,UAAU,CAAC,EAAE,iBAAiB,CAAC,gBAAgB,CAAC,GAAG,SAAS,GAC3D,OAAO,CAAC;QACT,QAAQ,EAAE,gBAAgB,SAAS,IAAI,GACnC,SAAS;YACP,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;YACvB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACvC,EAAE,GACH,SAAS,KAAK,MAAM,EAAE,EAAE,CAAC;QAC7B,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;CACJ,CAAC;AACF,KAAK,WAAW,GAAG;IACjB,sBAAsB,EAAE,MAAM,CAAC;CAChC,CAAC;AAMF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,qBAAqB,GAC1B,iBAAiB,CAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAwKtD"}
|
package/package.json
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
"@biomejs/biome": "2.0.6",
|
|
8
8
|
"@wagmi/core": "2.21.2",
|
|
9
9
|
"rimraf": "6.0.1",
|
|
10
|
-
"thirdweb": "5.112.
|
|
10
|
+
"thirdweb": "5.112.3"
|
|
11
11
|
},
|
|
12
12
|
"engines": {
|
|
13
13
|
"node": ">=18"
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"type": "module",
|
|
46
46
|
"types": "./dist/types/exports/thirdweb.d.ts",
|
|
47
47
|
"typings": "./dist/types/exports/thirdweb.d.ts",
|
|
48
|
-
"version": "0.2.
|
|
48
|
+
"version": "0.2.189",
|
|
49
49
|
"scripts": {
|
|
50
50
|
"dev": "tsc --project ./tsconfig.build.json --module nodenext --moduleResolution nodenext --outDir ./dist/esm --watch",
|
|
51
51
|
"build": "pnpm clean && pnpm build:cjs && pnpm build:esm && pnpm build:types",
|
package/src/connector.ts
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import { type CreateConnectorFn, createConnector } from "@wagmi/core";
|
|
2
2
|
import type { Prettify } from "@wagmi/core/chains";
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
type Chain,
|
|
5
|
+
defineChain,
|
|
6
|
+
getAddress,
|
|
7
|
+
type ThirdwebClient,
|
|
8
|
+
} from "thirdweb";
|
|
4
9
|
import {
|
|
5
10
|
EIP1193,
|
|
6
11
|
ecosystemWallet,
|
|
@@ -53,6 +58,7 @@ type StorageItem = {
|
|
|
53
58
|
|
|
54
59
|
const activeWalletIdKey = "thirdweb:active-wallet-id";
|
|
55
60
|
const connectedWalletIdsKey = "thirdweb:connected-wallet-ids";
|
|
61
|
+
const activeChainIdKey = "thirdweb:active-chain";
|
|
56
62
|
|
|
57
63
|
/**
|
|
58
64
|
* Connect to an in-app wallet using the auth strategy of your choice.
|
|
@@ -112,13 +118,14 @@ export function inAppWalletConnector(
|
|
|
112
118
|
? window.localStorage
|
|
113
119
|
: undefined;
|
|
114
120
|
return createConnector((config) => ({
|
|
115
|
-
connect: async (params
|
|
121
|
+
connect: async (params) => {
|
|
116
122
|
wallet =
|
|
117
123
|
params && "wallet" in params ? (params.wallet as Wallet) : wallet;
|
|
118
|
-
const lastChainIdStr =
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
124
|
+
const lastChainIdStr = rawStorage?.getItem(activeChainIdKey);
|
|
125
|
+
const lastChain = lastChainIdStr
|
|
126
|
+
? (JSON.parse(lastChainIdStr) as Chain)
|
|
127
|
+
: undefined;
|
|
128
|
+
const lastChainId = lastChain ? lastChain.id : undefined;
|
|
122
129
|
if (params?.isReconnecting) {
|
|
123
130
|
const { autoConnect } = await import("thirdweb/wallets");
|
|
124
131
|
const chainId = lastChainId || args.smartAccount?.chain?.id || 1;
|
|
@@ -133,7 +140,6 @@ export function inAppWalletConnector(
|
|
|
133
140
|
if (!account) {
|
|
134
141
|
throw new Error("Wallet failed to reconnect");
|
|
135
142
|
}
|
|
136
|
-
|
|
137
143
|
return {
|
|
138
144
|
accounts: [getAddress(account.address)] as any,
|
|
139
145
|
chainId: chainId,
|
|
@@ -144,7 +150,7 @@ export function inAppWalletConnector(
|
|
|
144
150
|
const alreadyConnectedAccount = wallet.getAccount();
|
|
145
151
|
if (alreadyConnectedAccount) {
|
|
146
152
|
return {
|
|
147
|
-
accounts: [getAddress(alreadyConnectedAccount.address)],
|
|
153
|
+
accounts: [getAddress(alreadyConnectedAccount.address)] as any,
|
|
148
154
|
chainId: wallet.getChain()?.id || 1,
|
|
149
155
|
};
|
|
150
156
|
}
|
|
@@ -191,9 +197,11 @@ export function inAppWalletConnector(
|
|
|
191
197
|
}
|
|
192
198
|
rawStorage.setItem(activeWalletIdKey, wallet.id);
|
|
193
199
|
}
|
|
194
|
-
await config.storage?.setItem("thirdweb:lastChainId", chain.id);
|
|
195
200
|
args.onConnect?.(wallet);
|
|
196
|
-
return {
|
|
201
|
+
return {
|
|
202
|
+
accounts: [getAddress(account.address)] as any,
|
|
203
|
+
chainId: chain.id,
|
|
204
|
+
};
|
|
197
205
|
},
|
|
198
206
|
disconnect: async () => {
|
|
199
207
|
await wallet.disconnect();
|
|
@@ -209,9 +217,7 @@ export function inAppWalletConnector(
|
|
|
209
217
|
return wallet.getChain()?.id || 1;
|
|
210
218
|
},
|
|
211
219
|
getProvider: async (params) => {
|
|
212
|
-
const lastChainIdStr = await
|
|
213
|
-
"thirdweb:lastChainId",
|
|
214
|
-
);
|
|
220
|
+
const lastChainIdStr = await rawStorage?.getItem(activeChainIdKey);
|
|
215
221
|
const lastChainId = lastChainIdStr ? Number(lastChainIdStr) : undefined;
|
|
216
222
|
const chain = defineChain(
|
|
217
223
|
params?.chainId || args.smartAccount?.chain?.id || lastChainId || 1,
|
|
@@ -262,7 +268,10 @@ export function inAppWalletConnector(
|
|
|
262
268
|
config.emitter.emit("change", {
|
|
263
269
|
chainId: chain.id,
|
|
264
270
|
});
|
|
265
|
-
|
|
271
|
+
rawStorage?.setItem(
|
|
272
|
+
activeChainIdKey,
|
|
273
|
+
JSON.stringify(defineChain(chain.id)),
|
|
274
|
+
);
|
|
266
275
|
return chain;
|
|
267
276
|
},
|
|
268
277
|
type: "in-app",
|