@ledgerhq/coin-solana 0.23.0 → 0.24.0-next.0

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 (26) hide show
  1. package/CHANGELOG.md +17 -0
  2. package/lib/__tests__/unit/hw-signMessage.unit.test.js +1 -1
  3. package/lib/buildTransaction.d.ts.map +1 -1
  4. package/lib/buildTransaction.js +9 -1
  5. package/lib/buildTransaction.js.map +1 -1
  6. package/lib/helpers/token.d.ts +3 -2
  7. package/lib/helpers/token.d.ts.map +1 -1
  8. package/lib/helpers/token.js +5 -1
  9. package/lib/helpers/token.js.map +1 -1
  10. package/lib/network/chain/web3.js +2 -2
  11. package/lib/network/chain/web3.js.map +1 -1
  12. package/lib-es/__tests__/unit/hw-signMessage.unit.test.js +1 -1
  13. package/lib-es/buildTransaction.d.ts.map +1 -1
  14. package/lib-es/buildTransaction.js +9 -1
  15. package/lib-es/buildTransaction.js.map +1 -1
  16. package/lib-es/helpers/token.d.ts +3 -2
  17. package/lib-es/helpers/token.d.ts.map +1 -1
  18. package/lib-es/helpers/token.js +3 -0
  19. package/lib-es/helpers/token.js.map +1 -1
  20. package/lib-es/network/chain/web3.js +3 -3
  21. package/lib-es/network/chain/web3.js.map +1 -1
  22. package/package.json +8 -8
  23. package/src/__tests__/unit/hw-signMessage.unit.test.ts +1 -1
  24. package/src/buildTransaction.ts +9 -1
  25. package/src/helpers/token.ts +10 -1
  26. package/src/network/chain/web3.ts +5 -5
package/CHANGELOG.md CHANGED
@@ -1,5 +1,22 @@
1
1
  # @ledgerhq/coin-solana
2
2
 
3
+ ## 0.24.0-next.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#10106](https://github.com/LedgerHQ/ledger-live/pull/10106) [`d8de57e`](https://github.com/LedgerHQ/ledger-live/commit/d8de57e1c166bc06620828043ed2795e19718fe9) Thanks [@francois-guerin-ledger](https://github.com/francois-guerin-ledger)! - core(lld, llm): warn users while sending SPLs with problematic extensions
8
+
9
+ ### Patch Changes
10
+
11
+ - Updated dependencies [[`107f35a`](https://github.com/LedgerHQ/ledger-live/commit/107f35a0650412716b088a3503b86435e6d9cf47), [`6253e0e`](https://github.com/LedgerHQ/ledger-live/commit/6253e0e3efcd1a29543cda55c9a5269f97aa770f), [`9081c26`](https://github.com/LedgerHQ/ledger-live/commit/9081c2648490f977469a33762a3c67bb2c2a0be5), [`eff3c94`](https://github.com/LedgerHQ/ledger-live/commit/eff3c94c1eded61518097a4544c3f5b25db1e28a)]:
12
+ - @ledgerhq/cryptoassets@13.18.0-next.0
13
+ - @ledgerhq/errors@6.21.0-next.0
14
+ - @ledgerhq/coin-framework@5.1.0-next.0
15
+ - @ledgerhq/live-env@2.9.0-next.0
16
+ - @ledgerhq/types-live@6.71.0-next.0
17
+ - @ledgerhq/devices@8.4.5-next.0
18
+ - @ledgerhq/live-network@2.0.8-next.0
19
+
3
20
  ## 0.23.0
4
21
 
5
22
  ### Minor Changes
package/lib/__tests__/unit/hw-signMessage.unit.test.js CHANGED
@@ -8,7 +8,7 @@ const signer_1 = require("../../signer");
8
8
  const config_1 = __importDefault(require("../../config"));
9
9
  const bs58_1 = __importDefault(require("bs58"));
10
10
  config_1.default.setCoinConfig(() => ({
11
- legacyOCMSMaxVersion: "1.8.2",
11
+ legacyOCMSMaxVersion: "1.8.0",
12
12
  queuedInterval: 1,
13
13
  token2022Enabled: false,
14
14
  status: { type: "active" },
package/lib/buildTransaction.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../src/buildTransaction.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAW,WAAW,EAAE,MAAM,SAAS,CAAC;AAcpD,OAAO,EAEL,oBAAoB,IAAI,kBAAkB,EAG1C,8BAA8B,EAE/B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC,eAAO,MAAM,uBAAuB,YACzB,MAAM,eACF,WAAW,OACnB,QAAQ;;;gBAKC,MAAM,KAAK,kBAAkB,EA2B5C,CAAC"}
1
+ {"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../src/buildTransaction.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAW,WAAW,EAAE,MAAM,SAAS,CAAC;AAcpD,OAAO,EAEL,oBAAoB,IAAI,kBAAkB,EAG1C,8BAA8B,EAE/B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAGrC,eAAO,MAAM,uBAAuB,YACzB,MAAM,eACF,WAAW,OACnB,QAAQ;;;gBAKC,MAAM,KAAK,kBAAkB,EA2B5C,CAAC"}
package/lib/buildTransaction.js CHANGED
@@ -4,6 +4,7 @@ exports.buildTransactionWithAPI = void 0;
4
4
  const web3_1 = require("./network/chain/web3");
5
5
  const utils_1 = require("./utils");
6
6
  const web3_js_1 = require("@solana/web3.js");
7
+ const logs_1 = require("@ledgerhq/logs");
7
8
  const buildTransactionWithAPI = async (address, transaction, api) => {
8
9
  const recentBlockhash = await api.getLatestBlockhash();
9
10
  let web3SolanaTransaction;
@@ -34,7 +35,14 @@ async function buildInstructions(api, tx) {
34
35
  if (commandDescriptor === undefined) {
35
36
  throw new Error("missing command descriptor");
36
37
  }
37
- if (Object.keys(commandDescriptor.errors).length > 0) {
38
+ const errorEntries = Object.entries(commandDescriptor.errors);
39
+ if (errorEntries.length > 0) {
40
+ (0, logs_1.trace)({
41
+ type: "solana/buildTransaction",
42
+ message: "can not build invalid command",
43
+ data: Object.fromEntries(errorEntries.map(([key, value]) => [key, value.message])),
44
+ context: { commandKind: commandDescriptor.command.kind },
45
+ });
38
46
  throw new Error("can not build invalid command");
39
47
  }
40
48
  return buildInstructionsForCommand(api, commandDescriptor.command);
package/lib/buildTransaction.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"buildTransaction.js","sourceRoot":"","sources":["../src/buildTransaction.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildTransaction.js","sourceRoot":"","sources":["../src/buildTransaction.ts"],"names":[],"mappings":"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"}
package/lib/helpers/token.d.ts CHANGED
@@ -1,10 +1,11 @@
1
1
  import type { PublicKey } from "@solana/web3.js";
2
2
  import { AccountLike } from "@ledgerhq/types-live";
3
- import { SolanaTokenProgram, TransferFeeCalculated } from "../types";
3
+ import { SolanaTokenAccountExtensions, SolanaTokenProgram, TransferFeeCalculated } from "../types";
4
4
  import { TransferFeeConfigExt } from "../network/chain/account/tokenExtensions";
5
5
  export declare function tokenIsListedOnLedger(currencyId: string, mint: string): boolean;
6
6
  export declare function isTokenAccountFrozen(account: AccountLike): boolean;
7
- export declare function getTokenExtensions(account: AccountLike): import("../types").SolanaTokenAccountExtensions | undefined;
7
+ export declare function getTokenExtensions(account: AccountLike): SolanaTokenAccountExtensions | undefined;
8
+ export declare function hasProblematicExtension(extensions: SolanaTokenAccountExtensions): boolean;
8
9
  export declare function getTokenAccountProgramId(program: SolanaTokenProgram): PublicKey;
9
10
  export declare function isTokenProgram(program: string): boolean;
10
11
  export declare function bpsToPercent(bps: number): number;
package/lib/helpers/token.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../src/helpers/token.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGjD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAsB,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAGhF,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE/E;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAElE;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,WAAW,+DAEtD;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,kBAAkB,GAAG,SAAS,CAE/E;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEhD;AAGD,wBAAgB,8BAA8B,CAAC,EAC7C,cAAc,EACd,sBAAsB,EACtB,YAAY,GACb,EAAE;IACD,cAAc,EAAE,MAAM,CAAC;IACvB,sBAAsB,EAAE,IAAI,CAC1B,oBAAoB,CAAC,OAAO,CAAC,EAC7B,kBAAkB,GAAG,kBAAkB,CACxC,CAAC;IACF,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,qBAAqB,CA6BxB"}
1
+ {"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../src/helpers/token.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGjD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAEL,4BAA4B,EAC5B,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAGhF,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE/E;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAElE;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,WAAW,4CAEtD;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,4BAA4B,WAE/E;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,kBAAkB,GAAG,SAAS,CAE/E;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEhD;AAGD,wBAAgB,8BAA8B,CAAC,EAC7C,cAAc,EACd,sBAAsB,EACtB,YAAY,GACb,EAAE;IACD,cAAc,EAAE,MAAM,CAAC;IACvB,sBAAsB,EAAE,IAAI,CAC1B,oBAAoB,CAAC,OAAO,CAAC,EAC7B,kBAAkB,GAAG,kBAAkB,CACxC,CAAC;IACF,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,qBAAqB,CA6BxB"}
package/lib/helpers/token.js CHANGED
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.calculateToken2022TransferFees = exports.bpsToPercent = exports.isTokenProgram = exports.getTokenAccountProgramId = exports.getTokenExtensions = exports.isTokenAccountFrozen = exports.tokenIsListedOnLedger = void 0;
6
+ exports.calculateToken2022TransferFees = exports.bpsToPercent = exports.isTokenProgram = exports.getTokenAccountProgramId = exports.hasProblematicExtension = exports.getTokenExtensions = exports.isTokenAccountFrozen = exports.tokenIsListedOnLedger = void 0;
7
7
  const bignumber_js_1 = __importDefault(require("bignumber.js"));
8
8
  const spl_token_1 = require("@solana/spl-token");
9
9
  const cryptoassets_1 = require("@ledgerhq/cryptoassets");
@@ -20,6 +20,10 @@ function getTokenExtensions(account) {
20
20
  return account.type === "TokenAccount" ? account?.extensions : undefined;
21
21
  }
22
22
  exports.getTokenExtensions = getTokenExtensions;
23
+ function hasProblematicExtension(extensions) {
24
+ return ["transferFee", "transferHook"].some(extension => extension in extensions);
25
+ }
26
+ exports.hasProblematicExtension = hasProblematicExtension;
23
27
  function getTokenAccountProgramId(program) {
24
28
  return program === constants_1.PARSED_PROGRAMS.SPL_TOKEN_2022 ? spl_token_1.TOKEN_2022_PROGRAM_ID : spl_token_1.TOKEN_PROGRAM_ID;
25
29
  }
package/lib/helpers/token.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/helpers/token.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AAErC,iDAA4E;AAC5E,yDAAsE;AAItE,kEAAqE;AAErE,SAAgB,qBAAqB,CAAC,UAAkB,EAAE,IAAY;IACpE,OAAO,IAAA,2CAA4B,EAAC,IAAI,EAAE,UAAU,CAAC,EAAE,IAAI,KAAK,eAAe,CAAC;AAClF,CAAC;AAFD,sDAEC;AAED,SAAgB,oBAAoB,CAAC,OAAoB;IACvD,OAAO,OAAO,CAAC,IAAI,KAAK,cAAc,IAAK,OAA8B,EAAE,KAAK,KAAK,QAAQ,CAAC;AAChG,CAAC;AAFD,oDAEC;AAED,SAAgB,kBAAkB,CAAC,OAAoB;IACrD,OAAO,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAE,OAA8B,EAAE,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;AACnG,CAAC;AAFD,gDAEC;AAED,SAAgB,wBAAwB,CAAC,OAA2B;IAClE,OAAO,OAAO,KAAK,2BAAe,CAAC,cAAc,CAAC,CAAC,CAAC,iCAAqB,CAAC,CAAC,CAAC,4BAAgB,CAAC;AAC/F,CAAC;AAFD,4DAEC;AAED,SAAgB,cAAc,CAAC,OAAe;IAC5C,OAAO,OAAO,KAAK,2BAAe,CAAC,SAAS,IAAI,OAAO,KAAK,2BAAe,CAAC,cAAc,CAAC;AAC7F,CAAC;AAFD,wCAEC;AAED,SAAgB,YAAY,CAAC,GAAW;IACtC,OAAO,IAAA,sBAAS,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC5C,CAAC;AAFD,oCAEC;AAED,6DAA6D;AAC7D,SAAgB,8BAA8B,CAAC,EAC7C,cAAc,EACd,sBAAsB,EACtB,YAAY,GAQb;IACC,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,sBAAsB,CAAC;IACtE,MAAM,iBAAiB,GACrB,YAAY,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAE/E,MAAM,EAAE,UAAU,EAAE,sBAAsB,EAAE,GAAG,iBAAiB,CAAC;IACjE,MAAM,UAAU,GAAG,IAAA,sBAAS,EAAC,YAAY,CAAC,sBAAsB,CAAC,CAAC,CAAC;IACnE,IAAI,0BAA0B,GAAG,IAAA,sBAAS,EAAC,cAAc,CAAC;SACvD,GAAG,CAAC,IAAA,sBAAS,EAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SAC5C,aAAa,CAAC,CAAC,EAAE,sBAAS,CAAC,QAAQ,CAAC;SACpC,QAAQ,EAAE,CAAC;IACd,IAAI,WAAW,GAAG,0BAA0B,GAAG,cAAc,CAAC;IAE9D,IAAI,WAAW,GAAG,UAAU,EAAE,CAAC;QAC7B,WAAW,GAAG,UAAU,CAAC;QACzB,0BAA0B,GAAG,cAAc,GAAG,UAAU,CAAC;IAC3D,CAAC;IAED,OAAO;QACL,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;QACjC,cAAc,EAAE,UAAU;QAC1B,WAAW;QACX,MAAM,EAAE,sBAAsB;QAC9B,0BAA0B;QAC1B,0BAA0B,EAAE,IAAA,sBAAS,EAAC,cAAc,CAAC;aAClD,KAAK,CAAC,WAAW,CAAC;aAClB,aAAa,CAAC,CAAC,EAAE,sBAAS,CAAC,QAAQ,CAAC;aACpC,QAAQ,EAAE;KACd,CAAC;AACJ,CAAC;AAxCD,wEAwCC"}
1
+ {"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/helpers/token.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AAErC,iDAA4E;AAC5E,yDAAsE;AAStE,kEAAqE;AAErE,SAAgB,qBAAqB,CAAC,UAAkB,EAAE,IAAY;IACpE,OAAO,IAAA,2CAA4B,EAAC,IAAI,EAAE,UAAU,CAAC,EAAE,IAAI,KAAK,eAAe,CAAC;AAClF,CAAC;AAFD,sDAEC;AAED,SAAgB,oBAAoB,CAAC,OAAoB;IACvD,OAAO,OAAO,CAAC,IAAI,KAAK,cAAc,IAAK,OAA8B,EAAE,KAAK,KAAK,QAAQ,CAAC;AAChG,CAAC;AAFD,oDAEC;AAED,SAAgB,kBAAkB,CAAC,OAAoB;IACrD,OAAO,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAE,OAA8B,EAAE,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;AACnG,CAAC;AAFD,gDAEC;AAED,SAAgB,uBAAuB,CAAC,UAAwC;IAC9E,OAAO,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,IAAI,UAAU,CAAC,CAAC;AACpF,CAAC;AAFD,0DAEC;AAED,SAAgB,wBAAwB,CAAC,OAA2B;IAClE,OAAO,OAAO,KAAK,2BAAe,CAAC,cAAc,CAAC,CAAC,CAAC,iCAAqB,CAAC,CAAC,CAAC,4BAAgB,CAAC;AAC/F,CAAC;AAFD,4DAEC;AAED,SAAgB,cAAc,CAAC,OAAe;IAC5C,OAAO,OAAO,KAAK,2BAAe,CAAC,SAAS,IAAI,OAAO,KAAK,2BAAe,CAAC,cAAc,CAAC;AAC7F,CAAC;AAFD,wCAEC;AAED,SAAgB,YAAY,CAAC,GAAW;IACtC,OAAO,IAAA,sBAAS,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC5C,CAAC;AAFD,oCAEC;AAED,6DAA6D;AAC7D,SAAgB,8BAA8B,CAAC,EAC7C,cAAc,EACd,sBAAsB,EACtB,YAAY,GAQb;IACC,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,sBAAsB,CAAC;IACtE,MAAM,iBAAiB,GACrB,YAAY,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAE/E,MAAM,EAAE,UAAU,EAAE,sBAAsB,EAAE,GAAG,iBAAiB,CAAC;IACjE,MAAM,UAAU,GAAG,IAAA,sBAAS,EAAC,YAAY,CAAC,sBAAsB,CAAC,CAAC,CAAC;IACnE,IAAI,0BAA0B,GAAG,IAAA,sBAAS,EAAC,cAAc,CAAC;SACvD,GAAG,CAAC,IAAA,sBAAS,EAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SAC5C,aAAa,CAAC,CAAC,EAAE,sBAAS,CAAC,QAAQ,CAAC;SACpC,QAAQ,EAAE,CAAC;IACd,IAAI,WAAW,GAAG,0BAA0B,GAAG,cAAc,CAAC;IAE9D,IAAI,WAAW,GAAG,UAAU,EAAE,CAAC;QAC7B,WAAW,GAAG,UAAU,CAAC;QACzB,0BAA0B,GAAG,cAAc,GAAG,UAAU,CAAC;IAC3D,CAAC;IAED,OAAO;QACL,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;QACjC,cAAc,EAAE,UAAU;QAC1B,WAAW;QACX,MAAM,EAAE,sBAAsB;QAC9B,0BAA0B;QAC1B,0BAA0B,EAAE,IAAA,sBAAS,EAAC,cAAc,CAAC;aAClD,KAAK,CAAC,WAAW,CAAC;aAClB,aAAa,CAAC,CAAC,EAAE,sBAAS,CAAC,QAAQ,CAAC;aACpC,QAAQ,EAAE;KACd,CAAC;AACJ,CAAC;AAxCD,wEAwCC"}
package/lib/network/chain/web3.js CHANGED
@@ -94,9 +94,9 @@ const buildTokenTransferInstructions = async (api, command) => {
94
94
  if (recipientDescriptor.shouldCreateAsAssociatedTokenAccount) {
95
95
  instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(ownerPubkey, destinationPubkey, destinationOwnerPubkey, mintPubkey, programId));
96
96
  }
97
- const amountWithFee = extensions?.transferFee?.transferAmountIncludingFee;
97
+ const transferFeeCalculated = extensions?.transferFee;
98
98
  const transferIx = tokenProgram === constants_1.PARSED_PROGRAMS.SPL_TOKEN_2022
99
- ? await (0, spl_token_1.createTransferCheckedWithTransferHookInstruction)(api.connection, new web3_js_1.PublicKey(ownerAssociatedTokenAccountAddress), mintPubkey, destinationPubkey, ownerPubkey, BigInt(amountWithFee || amount), mintDecimals, undefined, "confirmed", programId)
99
+ ? await (0, spl_token_1.createTransferCheckedWithFeeAndTransferHookInstruction)(api.connection, new web3_js_1.PublicKey(ownerAssociatedTokenAccountAddress), mintPubkey, destinationPubkey, ownerPubkey, BigInt(transferFeeCalculated?.transferAmountIncludingFee || amount), mintDecimals, BigInt(transferFeeCalculated?.transferFee ?? 0), undefined, "confirmed", programId)
100
100
  : (0, spl_token_1.createTransferCheckedInstruction)(new web3_js_1.PublicKey(ownerAssociatedTokenAccountAddress), mintPubkey, destinationPubkey, ownerPubkey, amount, mintDecimals, undefined, programId);
101
101
  instructions.push(transferIx);
102
102
  if (memo) {
package/lib/network/chain/web3.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"web3.js","sourceRoot":"","sources":["../../../src/network/chain/web3.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"web3.js","sourceRoot":"","sources":["../../../src/network/chain/web3.ts"],"names":[],"mappings":"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"}
package/lib-es/__tests__/unit/hw-signMessage.unit.test.js CHANGED
@@ -3,7 +3,7 @@ import { PubKeyDisplayMode } from "../../signer";
3
3
  import coinConfig from "../../config";
4
4
  import bs58 from "bs58";
5
5
  coinConfig.setCoinConfig(() => ({
6
- legacyOCMSMaxVersion: "1.8.2",
6
+ legacyOCMSMaxVersion: "1.8.0",
7
7
  queuedInterval: 1,
8
8
  token2022Enabled: false,
9
9
  status: { type: "active" },
package/lib-es/buildTransaction.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../src/buildTransaction.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAW,WAAW,EAAE,MAAM,SAAS,CAAC;AAcpD,OAAO,EAEL,oBAAoB,IAAI,kBAAkB,EAG1C,8BAA8B,EAE/B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC,eAAO,MAAM,uBAAuB,YACzB,MAAM,eACF,WAAW,OACnB,QAAQ;;;gBAKC,MAAM,KAAK,kBAAkB,EA2B5C,CAAC"}
1
+ {"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../src/buildTransaction.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAW,WAAW,EAAE,MAAM,SAAS,CAAC;AAcpD,OAAO,EAEL,oBAAoB,IAAI,kBAAkB,EAG1C,8BAA8B,EAE/B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAGrC,eAAO,MAAM,uBAAuB,YACzB,MAAM,eACF,WAAW,OACnB,QAAQ;;;gBAKC,MAAM,KAAK,kBAAkB,EA2B5C,CAAC"}
package/lib-es/buildTransaction.js CHANGED
@@ -1,6 +1,7 @@
1
1
  import { buildTransferInstructions, buildTokenTransferInstructions, buildCreateAssociatedTokenAccountInstruction, buildApproveTransactionInstructions, buildRevokeTransactionInstructions, buildStakeCreateAccountInstructions, buildStakeDelegateInstructions, buildStakeUndelegateInstructions, buildStakeWithdrawInstructions, buildStakeSplitInstructions, } from "./network/chain/web3";
2
2
  import { assertUnreachable } from "./utils";
3
3
  import { PublicKey, VersionedTransaction as OnChainTransaction, TransactionMessage, } from "@solana/web3.js";
4
+ import { trace } from "@ledgerhq/logs";
4
5
  export const buildTransactionWithAPI = async (address, transaction, api) => {
5
6
  const recentBlockhash = await api.getLatestBlockhash();
6
7
  let web3SolanaTransaction;
@@ -30,7 +31,14 @@ async function buildInstructions(api, tx) {
30
31
  if (commandDescriptor === undefined) {
31
32
  throw new Error("missing command descriptor");
32
33
  }
33
- if (Object.keys(commandDescriptor.errors).length > 0) {
34
+ const errorEntries = Object.entries(commandDescriptor.errors);
35
+ if (errorEntries.length > 0) {
36
+ trace({
37
+ type: "solana/buildTransaction",
38
+ message: "can not build invalid command",
39
+ data: Object.fromEntries(errorEntries.map(([key, value]) => [key, value.message])),
40
+ context: { commandKind: commandDescriptor.command.kind },
41
+ });
34
42
  throw new Error("can not build invalid command");
35
43
  }
36
44
  return buildInstructionsForCommand(api, commandDescriptor.command);
package/lib-es/buildTransaction.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"buildTransaction.js","sourceRoot":"","sources":["../src/buildTransaction.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildTransaction.js","sourceRoot":"","sources":["../src/buildTransaction.ts"],"names":[],"mappings":"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"}
package/lib-es/helpers/token.d.ts CHANGED
@@ -1,10 +1,11 @@
1
1
  import type { PublicKey } from "@solana/web3.js";
2
2
  import { AccountLike } from "@ledgerhq/types-live";
3
- import { SolanaTokenProgram, TransferFeeCalculated } from "../types";
3
+ import { SolanaTokenAccountExtensions, SolanaTokenProgram, TransferFeeCalculated } from "../types";
4
4
  import { TransferFeeConfigExt } from "../network/chain/account/tokenExtensions";
5
5
  export declare function tokenIsListedOnLedger(currencyId: string, mint: string): boolean;
6
6
  export declare function isTokenAccountFrozen(account: AccountLike): boolean;
7
- export declare function getTokenExtensions(account: AccountLike): import("../types").SolanaTokenAccountExtensions | undefined;
7
+ export declare function getTokenExtensions(account: AccountLike): SolanaTokenAccountExtensions | undefined;
8
+ export declare function hasProblematicExtension(extensions: SolanaTokenAccountExtensions): boolean;
8
9
  export declare function getTokenAccountProgramId(program: SolanaTokenProgram): PublicKey;
9
10
  export declare function isTokenProgram(program: string): boolean;
10
11
  export declare function bpsToPercent(bps: number): number;
package/lib-es/helpers/token.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../src/helpers/token.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGjD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAsB,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAGhF,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE/E;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAElE;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,WAAW,+DAEtD;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,kBAAkB,GAAG,SAAS,CAE/E;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEhD;AAGD,wBAAgB,8BAA8B,CAAC,EAC7C,cAAc,EACd,sBAAsB,EACtB,YAAY,GACb,EAAE;IACD,cAAc,EAAE,MAAM,CAAC;IACvB,sBAAsB,EAAE,IAAI,CAC1B,oBAAoB,CAAC,OAAO,CAAC,EAC7B,kBAAkB,GAAG,kBAAkB,CACxC,CAAC;IACF,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,qBAAqB,CA6BxB"}
1
+ {"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../src/helpers/token.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGjD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAEL,4BAA4B,EAC5B,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAGhF,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE/E;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAElE;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,WAAW,4CAEtD;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,4BAA4B,WAE/E;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,kBAAkB,GAAG,SAAS,CAE/E;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEhD;AAGD,wBAAgB,8BAA8B,CAAC,EAC7C,cAAc,EACd,sBAAsB,EACtB,YAAY,GACb,EAAE;IACD,cAAc,EAAE,MAAM,CAAC;IACvB,sBAAsB,EAAE,IAAI,CAC1B,oBAAoB,CAAC,OAAO,CAAC,EAC7B,kBAAkB,GAAG,kBAAkB,CACxC,CAAC;IACF,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,qBAAqB,CA6BxB"}
package/lib-es/helpers/token.js CHANGED
@@ -11,6 +11,9 @@ export function isTokenAccountFrozen(account) {
11
11
  export function getTokenExtensions(account) {
12
12
  return account.type === "TokenAccount" ? account?.extensions : undefined;
13
13
  }
14
+ export function hasProblematicExtension(extensions) {
15
+ return ["transferFee", "transferHook"].some(extension => extension in extensions);
16
+ }
14
17
  export function getTokenAccountProgramId(program) {
15
18
  return program === PARSED_PROGRAMS.SPL_TOKEN_2022 ? TOKEN_2022_PROGRAM_ID : TOKEN_PROGRAM_ID;
16
19
  }
package/lib-es/helpers/token.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/helpers/token.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAItE,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAErE,MAAM,UAAU,qBAAqB,CAAC,UAAkB,EAAE,IAAY;IACpE,OAAO,4BAA4B,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,IAAI,KAAK,eAAe,CAAC;AAClF,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAoB;IACvD,OAAO,OAAO,CAAC,IAAI,KAAK,cAAc,IAAK,OAA8B,EAAE,KAAK,KAAK,QAAQ,CAAC;AAChG,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAoB;IACrD,OAAO,OAAO,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAE,OAA8B,EAAE,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;AACnG,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,OAA2B;IAClE,OAAO,OAAO,KAAK,eAAe,CAAC,cAAc,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,gBAAgB,CAAC;AAC/F,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAe;IAC5C,OAAO,OAAO,KAAK,eAAe,CAAC,SAAS,IAAI,OAAO,KAAK,eAAe,CAAC,cAAc,CAAC;AAC7F,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,GAAW;IACtC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC5C,CAAC;AAED,6DAA6D;AAC7D,MAAM,UAAU,8BAA8B,CAAC,EAC7C,cAAc,EACd,sBAAsB,EACtB,YAAY,GAQb;IACC,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,sBAAsB,CAAC;IACtE,MAAM,iBAAiB,GACrB,YAAY,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAE/E,MAAM,EAAE,UAAU,EAAE,sBAAsB,EAAE,GAAG,iBAAiB,CAAC;IACjE,MAAM,UAAU,GAAG,SAAS,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAAC,CAAC;IACnE,IAAI,0BAA0B,GAAG,SAAS,CAAC,cAAc,CAAC;SACvD,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SAC5C,aAAa,CAAC,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC;SACpC,QAAQ,EAAE,CAAC;IACd,IAAI,WAAW,GAAG,0BAA0B,GAAG,cAAc,CAAC;IAE9D,IAAI,WAAW,GAAG,UAAU,EAAE,CAAC;QAC7B,WAAW,GAAG,UAAU,CAAC;QACzB,0BAA0B,GAAG,cAAc,GAAG,UAAU,CAAC;IAC3D,CAAC;IAED,OAAO;QACL,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;QACjC,cAAc,EAAE,UAAU;QAC1B,WAAW;QACX,MAAM,EAAE,sBAAsB;QAC9B,0BAA0B;QAC1B,0BAA0B,EAAE,SAAS,CAAC,cAAc,CAAC;aAClD,KAAK,CAAC,WAAW,CAAC;aAClB,aAAa,CAAC,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC;aACpC,QAAQ,EAAE;KACd,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/helpers/token.ts"],"names":[],"mappings":"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"}
package/lib-es/network/chain/web3.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import BigNumber from "bignumber.js";
2
- import { createAmountToUiAmountInstruction, createApproveCheckedInstruction, createAssociatedTokenAccountInstruction, createRevokeInstruction, createTransferCheckedInstruction, createTransferCheckedWithTransferHookInstruction, getAssociatedTokenAddress, TOKEN_2022_PROGRAM_ID, } from "@solana/spl-token";
2
+ import { createAmountToUiAmountInstruction, createApproveCheckedInstruction, createAssociatedTokenAccountInstruction, createRevokeInstruction, createTransferCheckedInstruction, createTransferCheckedWithFeeAndTransferHookInstruction, getAssociatedTokenAddress, TOKEN_2022_PROGRAM_ID, } from "@solana/spl-token";
3
3
  import { PublicKey, StakeProgram, SystemProgram, TransactionInstruction, ComputeBudgetProgram, VersionedTransaction, TransactionMessage, } from "@solana/web3.js";
4
4
  import chunk from "lodash/chunk";
5
5
  import uniq from "lodash/uniq";
@@ -84,9 +84,9 @@ export const buildTokenTransferInstructions = async (api, command) => {
84
84
  if (recipientDescriptor.shouldCreateAsAssociatedTokenAccount) {
85
85
  instructions.push(createAssociatedTokenAccountInstruction(ownerPubkey, destinationPubkey, destinationOwnerPubkey, mintPubkey, programId));
86
86
  }
87
- const amountWithFee = extensions?.transferFee?.transferAmountIncludingFee;
87
+ const transferFeeCalculated = extensions?.transferFee;
88
88
  const transferIx = tokenProgram === PARSED_PROGRAMS.SPL_TOKEN_2022
89
- ? await createTransferCheckedWithTransferHookInstruction(api.connection, new PublicKey(ownerAssociatedTokenAccountAddress), mintPubkey, destinationPubkey, ownerPubkey, BigInt(amountWithFee || amount), mintDecimals, undefined, "confirmed", programId)
89
+ ? await createTransferCheckedWithFeeAndTransferHookInstruction(api.connection, new PublicKey(ownerAssociatedTokenAccountAddress), mintPubkey, destinationPubkey, ownerPubkey, BigInt(transferFeeCalculated?.transferAmountIncludingFee || amount), mintDecimals, BigInt(transferFeeCalculated?.transferFee ?? 0), undefined, "confirmed", programId)
90
90
  : createTransferCheckedInstruction(new PublicKey(ownerAssociatedTokenAccountAddress), mintPubkey, destinationPubkey, ownerPubkey, amount, mintDecimals, undefined, programId);
91
91
  instructions.push(transferIx);
92
92
  if (memo) {
package/lib-es/network/chain/web3.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"web3.js","sourceRoot":"","sources":["../../../src/network/chain/web3.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"web3.js","sourceRoot":"","sources":["../../../src/network/chain/web3.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ledgerhq/coin-solana",
3
- "version": "0.23.0",
3
+ "version": "0.24.0-next.0",
4
4
  "description": "Ledger Solana Coin integration",
5
5
  "keywords": [
6
6
  "Ledger",
@@ -56,15 +56,15 @@
56
56
  "rxjs": "^7.8.1",
57
57
  "semver": "7.7.1",
58
58
  "superstruct": "0.16.7",
59
- "@ledgerhq/coin-framework": "^5.0.2",
60
- "@ledgerhq/cryptoassets": "^13.17.0",
61
- "@ledgerhq/devices": "8.4.4",
62
- "@ledgerhq/errors": "^6.19.1",
63
- "@ledgerhq/live-env": "^2.8.0",
64
- "@ledgerhq/live-network": "^2.0.7",
59
+ "@ledgerhq/coin-framework": "^5.1.0-next.0",
60
+ "@ledgerhq/cryptoassets": "^13.18.0-next.0",
61
+ "@ledgerhq/devices": "8.4.5-next.0",
62
+ "@ledgerhq/errors": "^6.21.0-next.0",
63
+ "@ledgerhq/live-env": "^2.9.0-next.0",
64
+ "@ledgerhq/live-network": "^2.0.8-next.0",
65
65
  "@ledgerhq/logs": "^6.12.0",
66
66
  "@ledgerhq/types-cryptoassets": "^7.23.0",
67
- "@ledgerhq/types-live": "^6.70.0"
67
+ "@ledgerhq/types-live": "^6.71.0-next.0"
68
68
  },
69
69
  "devDependencies": {
70
70
  "@faker-js/faker": "^8.4.1",
package/src/__tests__/unit/hw-signMessage.unit.test.ts CHANGED
@@ -6,7 +6,7 @@ import coinConfig from "../../config";
6
6
  import bs58 from "bs58";
7
7
 
8
8
  coinConfig.setCoinConfig(() => ({
9
- legacyOCMSMaxVersion: "1.8.2",
9
+ legacyOCMSMaxVersion: "1.8.0",
10
10
  queuedInterval: 1,
11
11
  token2022Enabled: false,
12
12
  status: { type: "active" },
package/src/buildTransaction.ts CHANGED
@@ -21,6 +21,7 @@ import {
21
21
  VersionedTransaction,
22
22
  } from "@solana/web3.js";
23
23
  import { ChainAPI } from "./network";
24
+ import { trace } from "@ledgerhq/logs";
24
25
 
25
26
  export const buildTransactionWithAPI = async (
26
27
  address: string,
@@ -67,7 +68,14 @@ async function buildInstructions(
67
68
  if (commandDescriptor === undefined) {
68
69
  throw new Error("missing command descriptor");
69
70
  }
70
- if (Object.keys(commandDescriptor.errors).length > 0) {
71
+ const errorEntries = Object.entries(commandDescriptor.errors);
72
+ if (errorEntries.length > 0) {
73
+ trace({
74
+ type: "solana/buildTransaction",
75
+ message: "can not build invalid command",
76
+ data: Object.fromEntries(errorEntries.map(([key, value]) => [key, value.message])),
77
+ context: { commandKind: commandDescriptor.command.kind },
78
+ });
71
79
  throw new Error("can not build invalid command");
72
80
  }
73
81
  return buildInstructionsForCommand(api, commandDescriptor.command);
package/src/helpers/token.ts CHANGED
@@ -3,7 +3,12 @@ import type { PublicKey } from "@solana/web3.js";
3
3
  import { TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from "@solana/spl-token";
4
4
  import { findTokenByAddressInCurrency } from "@ledgerhq/cryptoassets";
5
5
  import { AccountLike } from "@ledgerhq/types-live";
6
- import { SolanaTokenAccount, SolanaTokenProgram, TransferFeeCalculated } from "../types";
6
+ import {
7
+ SolanaTokenAccount,
8
+ SolanaTokenAccountExtensions,
9
+ SolanaTokenProgram,
10
+ TransferFeeCalculated,
11
+ } from "../types";
7
12
  import { TransferFeeConfigExt } from "../network/chain/account/tokenExtensions";
8
13
  import { PARSED_PROGRAMS } from "../network/chain/program/constants";
9
14
 
@@ -19,6 +24,10 @@ export function getTokenExtensions(account: AccountLike) {
19
24
  return account.type === "TokenAccount" ? (account as SolanaTokenAccount)?.extensions : undefined;
20
25
  }
21
26
 
27
+ export function hasProblematicExtension(extensions: SolanaTokenAccountExtensions) {
28
+ return ["transferFee", "transferHook"].some(extension => extension in extensions);
29
+ }
30
+
22
31
  export function getTokenAccountProgramId(program: SolanaTokenProgram): PublicKey {
23
32
  return program === PARSED_PROGRAMS.SPL_TOKEN_2022 ? TOKEN_2022_PROGRAM_ID : TOKEN_PROGRAM_ID;
24
33
  }
package/src/network/chain/web3.ts CHANGED
@@ -5,7 +5,7 @@ import {
5
5
  createAssociatedTokenAccountInstruction,
6
6
  createRevokeInstruction,
7
7
  createTransferCheckedInstruction,
8
- createTransferCheckedWithTransferHookInstruction,
8
+ createTransferCheckedWithFeeAndTransferHookInstruction,
9
9
  getAssociatedTokenAddress,
10
10
  TOKEN_2022_PROGRAM_ID,
11
11
  } from "@solana/spl-token";
@@ -220,18 +220,18 @@ export const buildTokenTransferInstructions = async (
220
220
  );
221
221
  }
222
222
 
223
- const amountWithFee = extensions?.transferFee?.transferAmountIncludingFee;
224
-
223
+ const transferFeeCalculated = extensions?.transferFee;
225
224
  const transferIx =
226
225
  tokenProgram === PARSED_PROGRAMS.SPL_TOKEN_2022
227
- ? await createTransferCheckedWithTransferHookInstruction(
226
+ ? await createTransferCheckedWithFeeAndTransferHookInstruction(
228
227
  api.connection,
229
228
  new PublicKey(ownerAssociatedTokenAccountAddress),
230
229
  mintPubkey,
231
230
  destinationPubkey,
232
231
  ownerPubkey,
233
- BigInt(amountWithFee || amount),
232
+ BigInt(transferFeeCalculated?.transferAmountIncludingFee || amount),
234
233
  mintDecimals,
234
+ BigInt(transferFeeCalculated?.transferFee ?? 0),
235
235
  undefined,
236
236
  "confirmed",
237
237
  programId,