@hot-labs/kit 1.2.3 → 1.2.4

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 (5) hide show
  1. package/build/near/wallet.d.ts +2 -2
  2. package/build/near/wallet.js +8 -7
  3. package/build/near/wallet.js.map +1 -1
  4. package/package.json +14 -12
  5. package/src/near/wallet.ts +9 -7
package/build/near/wallet.d.ts CHANGED
@@ -47,8 +47,8 @@ export default class NearWallet extends OmniWallet {
47
47
  comment?: string;
48
48
  gasFee?: ReviewFee;
49
49
  }): Promise<string>;
50
- isIntentAccountRegistered(): Promise<any>;
51
- registerIntentAccountIfNeeded(): Promise<void>;
50
+ isIntentAccountRegistered(publicKey: string): Promise<any>;
51
+ registerIntentAccountIfNeeded(publicKey: string): Promise<void>;
52
52
  signIntents(intents: Record<string, any>[], options?: {
53
53
  nonce?: Uint8Array;
54
54
  deadline?: number;
package/build/near/wallet.js CHANGED
@@ -151,16 +151,17 @@ export default class NearWallet extends OmniWallet {
151
151
  });
152
152
  return await this.sendTransaction({ receiverId: args.token.address, actions });
153
153
  }
154
- async isIntentAccountRegistered() {
154
+ async isIntentAccountRegistered(publicKey) {
155
155
  const keys = await rpc.viewMethod({
156
156
  contractId: "intents.near",
157
157
  methodName: "public_keys_of",
158
158
  args: { account_id: this.address },
159
159
  });
160
- return keys.includes(this.publicKey);
160
+ const list = keys.map((t) => t.split(":")[1].toLowerCase());
161
+ return list.includes(publicKey.split(":")[1].toLowerCase());
161
162
  }
162
- async registerIntentAccountIfNeeded() {
163
- let isRegistered = await this.isIntentAccountRegistered();
163
+ async registerIntentAccountIfNeeded(publicKey) {
164
+ let isRegistered = await this.isIntentAccountRegistered(publicKey);
164
165
  if (isRegistered)
165
166
  return;
166
167
  await this.sendTransaction({
@@ -170,14 +171,14 @@ export default class NearWallet extends OmniWallet {
170
171
  type: "FunctionCall",
171
172
  params: {
172
173
  methodName: "add_public_key",
173
- args: { public_key: this.publicKey },
174
+ args: { public_key: publicKey },
174
175
  gas: String(80n * TGAS),
175
176
  deposit: String(1n),
176
177
  },
177
178
  },
178
179
  ],
179
180
  }).catch(() => null);
180
- isRegistered = await this.isIntentAccountRegistered();
181
+ isRegistered = await this.isIntentAccountRegistered(publicKey);
181
182
  if (isRegistered)
182
183
  return;
183
184
  throw new Error("Failed to register intent account");
@@ -195,7 +196,7 @@ export default class NearWallet extends OmniWallet {
195
196
  if (!result)
196
197
  throw new Error("Failed to sign message");
197
198
  const { signature, publicKey } = result;
198
- await this.registerIntentAccountIfNeeded();
199
+ await this.registerIntentAccountIfNeeded(publicKey);
199
200
  return {
200
201
  standard: "nep413",
201
202
  payload: { nonce: base64.encode(nonce), recipient: "intents.near", message },
package/build/near/wallet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../src/near/wallet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../src/near/wallet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAElC,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,UAAU;IAI3B;IAA0B;IAA6B;IAHnE,IAAI,GAAG,4GAA4G,CAAC;IACpH,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAEhC,YAAqB,OAAe,EAAW,SAAkB,EAAW,MAAuB;QACjG,KAAK,EAAE,CAAC;QADW,YAAO,GAAP,OAAO,CAAQ;QAAW,cAAS,GAAT,SAAS,CAAS;QAAW,WAAM,GAAN,MAAM,CAAiB;IAEnG,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,CAAS,EAAE,SAAmB;QAChD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAChC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YAC5B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACrD,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC1B,CAAC,CAAC,CACH,CAAC;QAEF,OAAO,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAqC;QAC1D,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,MAAM,UAAU,CAAC;QACnC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QACjE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,MAAoC;QACxD,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,MAAM,UAAU,CAAC;QACnC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAChE,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAyB;QACzC,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,MAAM,UAAU,CAAC;QACnC,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,wBAAwB,CAAC,MAAc,EAAE,OAAe;QACnE,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC;YACnC,UAAU,EAAE,WAAW;YACvB,UAAU,EAAE,oBAAoB;YAChC,IAAI,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE;SAC9B,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG;YACpB,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE;gBACN,UAAU,EAAE,cAAc;gBAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC;gBACvB,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC;gBACvB,IAAI,EAAE,EAAE;aACT;SACF,CAAC;QAEF,IAAI,OAAO,IAAI,IAAI;YAAE,OAAO,CAAC,aAAa,CAAC,CAAC;QAC5C,OAAO;YACL;gBACE,IAAI,EAAE,cAAc;gBACpB,MAAM,EAAE;oBACN,GAAG,EAAE,GAAG,GAAG,IAAI;oBACf,UAAU,EAAE,iBAAiB;oBAC7B,OAAO,EAAE,yBAAyB;oBAClC,IAAI,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE;iBACvD;aACF;YACD,aAAa;SACd,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,KAAa,EAAE,OAAe;QACpD,IAAI,KAAK,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QACrC,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QAC/I,OAAO,OAAO,IAAI,IAAI,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAAa;QAC/B,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACzE,IAAI,CAAC,cAAc;YAAE,OAAO;QAE5B,MAAM,IAAI,CAAC,eAAe,CAAC;YACzB,UAAU,EAAE,KAAK;YACjB,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,cAAc;oBACpB,MAAM,EAAE;wBACN,UAAU,EAAE,iBAAiB;wBAC7B,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE;wBAC3D,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;wBACnB,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC;qBACxB;iBACF;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW;QACf,OAAO,IAAI,SAAS,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,GAAG,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAa,EAAE,OAAe;QAC/C,IAAI,KAAK,KAAK,IAAI;YAAE,MAAM,eAAe,CAAC;QAE1C,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;YACzB,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,2BAA2B,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;YACzF,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;YAC9E,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,CAAC,cAAc,CAAC,uBAAuB,CAAC,CAAC;YAClF,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,WAAW,CAAC;YAChE,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACpC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;YAC5C,MAAM,SAAS,GAAG,KAAK,GAAG,CAAC,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;YAC5E,OAAO,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QACzC,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC;YACnC,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE;YAClC,UAAU,EAAE,OAAO;YACnB,UAAU,EAAE,eAAe;SAC5B,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAA8F;QAC3G,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YACpC,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC;gBAChC,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBACzE,UAAU,EAAE,IAAI,CAAC,QAAQ;aAC1B,CAAC,CAAC;QACL,CAAC;QAED,MAAM,OAAO,GAAU;YACrB;gBACE,IAAI,EAAE,cAAc;gBACpB,MAAM,EAAE;oBACN,UAAU,EAAE,aAAa;oBACzB,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;oBACjE,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC;oBACvB,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;iBACpB;aACF;SACF,CAAC;QAEF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrF,IAAI,YAAY;YACd,OAAO,CAAC,OAAO,CAAC;gBACd,IAAI,EAAE,cAAc;gBACpB,MAAM,EAAE;oBACN,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC;oBACvB,UAAU,EAAE,iBAAiB;oBAC7B,OAAO,EAAE,yBAAyB;oBAClC,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,iBAAiB,EAAE,IAAI,EAAE;iBAC7D;aACF,CAAC,CAAC;QAEL,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IACjF,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,SAAiB;QAC/C,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC;YAChC,UAAU,EAAE,cAAc;YAC1B,UAAU,EAAE,gBAAgB;YAC5B,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE;SACnC,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QACpE,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,6BAA6B,CAAC,SAAiB;QACnD,IAAI,YAAY,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;QACnE,IAAI,YAAY;YAAE,OAAO;QAEzB,MAAM,IAAI,CAAC,eAAe,CAAC;YACzB,UAAU,EAAE,cAAc;YAC1B,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,cAAc;oBACpB,MAAM,EAAE;wBACN,UAAU,EAAE,gBAAgB;wBAC5B,IAAI,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE;wBAC/B,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC;wBACvB,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;qBACpB;iBACF;aACF;SACF,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QAErB,YAAY,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;QAC/D,IAAI,YAAY;YAAE,OAAO;QAEzB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAA8B,EAAE,OAAsE;QACtH,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,MAAM,UAAU,CAAC;QAEnC,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,OAAO,EAAE,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAClG,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;YAC7B,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,0BAA0B;YACnG,SAAS,EAAE,OAAO,EAAE,QAAQ,IAAI,IAAI,CAAC,WAAW;YAChD,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5F,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QACvD,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAExC,MAAM,IAAI,CAAC,6BAA6B,CAAC,SAAS,CAAC,CAAC;QAEpD,OAAO;YACL,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE;YAC5E,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE;YAC5G,UAAU,EAAE,SAAS;SACtB,CAAC;IACJ,CAAC;CACF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hot-labs/kit",
3
- "version": "1.2.3",
3
+ "version": "1.2.4",
4
4
  "description": "HOT Labs Kit is chain agnostic connector with omni payments",
5
5
  "license": "ISC",
6
6
  "author": "",
@@ -27,20 +27,11 @@
27
27
  "react": "^18.0.0",
28
28
  "react-dom": "^18.0.0"
29
29
  },
30
- "dependencies": {
30
+ "optionalDependencies": {
31
31
  "@cosmjs/cosmwasm-stargate": "^0.37.0",
32
32
  "@cosmjs/stargate": "^0.37.0",
33
- "@defuse-protocol/one-click-sdk-typescript": "^0.1.13",
34
- "@hot-labs/near-connect": "^0.8.1",
35
- "@hot-labs/omni-sdk": "^2.24.6",
36
33
  "@keplr-wallet/proto-types": "^0.12.291",
37
34
  "@keplr-wallet/provider-extension": "^0.12.291",
38
- "@lottiefiles/dotlottie-wc": "^0.8.11",
39
- "@near-js/crypto": "^2.3.3",
40
- "@near-js/providers": "^2.5.1",
41
- "@near-js/utils": "^2.2.4",
42
- "@noble/hashes": "^2.0.1",
43
- "@scure/base": "^2.0.0",
44
35
  "@solana/spl-token": "^0.4.14",
45
36
  "@solana/wallet-standard-features": "^1.3.0",
46
37
  "@stellar/freighter-api": "^6.0.1",
@@ -49,7 +40,18 @@
49
40
  "@ton/crypto": "^3.3.0",
50
41
  "@tonconnect/ui": "^2.2.0",
51
42
  "@wallet-standard/base": "^1.1.0",
52
- "@wallet-standard/features": "^1.1.0",
43
+ "@wallet-standard/features": "^1.1.0"
44
+ },
45
+ "dependencies": {
46
+ "@defuse-protocol/one-click-sdk-typescript": "^0.1.13",
47
+ "@hot-labs/near-connect": "^0.8.1",
48
+ "@hot-labs/omni-sdk": "^2.24.6",
49
+ "@lottiefiles/dotlottie-wc": "^0.8.11",
50
+ "@near-js/crypto": "^2.3.3",
51
+ "@near-js/providers": "^2.5.1",
52
+ "@near-js/utils": "^2.2.4",
53
+ "@noble/hashes": "^2.0.1",
54
+ "@scure/base": "^2.0.0",
53
55
  "@walletconnect/universal-provider": "^2.23.0",
54
56
  "ethers": "^6.15.0",
55
57
  "mobx": "^6.15.0",
package/src/near/wallet.ts CHANGED
@@ -168,17 +168,19 @@ export default class NearWallet extends OmniWallet {
168
168
  return await this.sendTransaction({ receiverId: args.token.address, actions });
169
169
  }
170
170
 
171
- async isIntentAccountRegistered() {
171
+ async isIntentAccountRegistered(publicKey: string) {
172
172
  const keys = await rpc.viewMethod({
173
173
  contractId: "intents.near",
174
174
  methodName: "public_keys_of",
175
175
  args: { account_id: this.address },
176
176
  });
177
- return keys.includes(this.publicKey);
177
+
178
+ const list = keys.map((t: string) => t.split(":")[1].toLowerCase());
179
+ return list.includes(publicKey.split(":")[1].toLowerCase());
178
180
  }
179
181
 
180
- async registerIntentAccountIfNeeded() {
181
- let isRegistered = await this.isIntentAccountRegistered();
182
+ async registerIntentAccountIfNeeded(publicKey: string) {
183
+ let isRegistered = await this.isIntentAccountRegistered(publicKey);
182
184
  if (isRegistered) return;
183
185
 
184
186
  await this.sendTransaction({
@@ -188,7 +190,7 @@ export default class NearWallet extends OmniWallet {
188
190
  type: "FunctionCall",
189
191
  params: {
190
192
  methodName: "add_public_key",
191
- args: { public_key: this.publicKey },
193
+ args: { public_key: publicKey },
192
194
  gas: String(80n * TGAS),
193
195
  deposit: String(1n),
194
196
  },
@@ -196,7 +198,7 @@ export default class NearWallet extends OmniWallet {
196
198
  ],
197
199
  }).catch(() => null);
198
200
 
199
- isRegistered = await this.isIntentAccountRegistered();
201
+ isRegistered = await this.isIntentAccountRegistered(publicKey);
200
202
  if (isRegistered) return;
201
203
 
202
204
  throw new Error("Failed to register intent account");
@@ -216,7 +218,7 @@ export default class NearWallet extends OmniWallet {
216
218
  if (!result) throw new Error("Failed to sign message");
217
219
  const { signature, publicKey } = result;
218
220
 
219
- await this.registerIntentAccountIfNeeded();
221
+ await this.registerIntentAccountIfNeeded(publicKey);
220
222
 
221
223
  return {
222
224
  standard: "nep413",