@ledgerhq/coin-aptos 3.8.0-nightly.20251216024112 → 3.8.0-nightly.20251217023943

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 (9) hide show
  1. package/CHANGELOG.md +11 -9
  2. package/lib/logic/getCoinAndAmounts.d.ts.map +1 -1
  3. package/lib/logic/getCoinAndAmounts.js +6 -4
  4. package/lib/logic/getCoinAndAmounts.js.map +1 -1
  5. package/lib-es/logic/getCoinAndAmounts.d.ts.map +1 -1
  6. package/lib-es/logic/getCoinAndAmounts.js +6 -4
  7. package/lib-es/logic/getCoinAndAmounts.js.map +1 -1
  8. package/package.json +10 -10
  9. package/src/logic/getCoinAndAmounts.ts +8 -4
package/CHANGELOG.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # @ledgerhq/coin-aptos
2
2
 
3
- ## 3.8.0-nightly.20251216024112
3
+ ## 3.8.0-nightly.20251217023943
4
4
 
5
5
  ### Minor Changes
6
6
 
@@ -10,15 +10,17 @@
10
10
 
11
11
  ### Patch Changes
12
12
 
13
+ - [#13191](https://github.com/LedgerHQ/ledger-live/pull/13191) [`e0378ba`](https://github.com/LedgerHQ/ledger-live/commit/e0378baf63fe4cf50fb31c9c8433cf2225197cbe) Thanks [@acewf](https://github.com/acewf)! - change address comparision
14
+
13
15
  - Updated dependencies [[`480a08a`](https://github.com/LedgerHQ/ledger-live/commit/480a08ae190119829910b46ecc6d2a9fb11bb7c2), [`19a54fd`](https://github.com/LedgerHQ/ledger-live/commit/19a54fd89a2d3c7481aebc28817870875f9d44dc), [`e63194f`](https://github.com/LedgerHQ/ledger-live/commit/e63194f7dbd5ff2b0135c26aac3842a2be676b0a), [`bc76d51`](https://github.com/LedgerHQ/ledger-live/commit/bc76d5154d35f8340b6b282c4909cd26920b8d40), [`4be69a7`](https://github.com/LedgerHQ/ledger-live/commit/4be69a71dcd7624a1cba8dd1b1847ef009eb2d83), [`7ae71b6`](https://github.com/LedgerHQ/ledger-live/commit/7ae71b64161424b398b63f77da5127085143fcdc), [`5fa83e4`](https://github.com/LedgerHQ/ledger-live/commit/5fa83e49c5fb103da7ecf0777b7e75bb35d5ed61), [`c5da2ce`](https://github.com/LedgerHQ/ledger-live/commit/c5da2cef7cded2b53c1af9aa3174cd27e5c92e0a), [`450f518`](https://github.com/LedgerHQ/ledger-live/commit/450f518d4cedb828c5fe1e7ccffaabd483f53226), [`30be235`](https://github.com/LedgerHQ/ledger-live/commit/30be2354822b3497c69322294ff1dab43375be50), [`bdacedf`](https://github.com/LedgerHQ/ledger-live/commit/bdacedfe32bea8ffce96ab675a44c0d7cf395143), [`5e8d6be`](https://github.com/LedgerHQ/ledger-live/commit/5e8d6be609dd37c48d747890e56189e0716d5273), [`768718d`](https://github.com/LedgerHQ/ledger-live/commit/768718df029bc8799b88c0299925dc56302b0c53), [`a5ad7d4`](https://github.com/LedgerHQ/ledger-live/commit/a5ad7d4578c06db3e40f260451b644c27e20cb62), [`3e70677`](https://github.com/LedgerHQ/ledger-live/commit/3e706774f8c4e9b768ab18b67abc3471cf61b6b6), [`aadb3d5`](https://github.com/LedgerHQ/ledger-live/commit/aadb3d57f5719cc2cc397975eafec8094b160afe), [`e44d216`](https://github.com/LedgerHQ/ledger-live/commit/e44d216d516df87e13f033ed64fedc1ce96380f4), [`d4bad44`](https://github.com/LedgerHQ/ledger-live/commit/d4bad4433c3fb083d95820d2927a9e8beeaf244f), [`8d8e1b7`](https://github.com/LedgerHQ/ledger-live/commit/8d8e1b7bb26305af326ea21710248223d1e8653b), [`07de7a8`](https://github.com/LedgerHQ/ledger-live/commit/07de7a87415ae4d1126e751d6a4d521ced3065e3), [`d37fa4b`](https://github.com/LedgerHQ/ledger-live/commit/d37fa4baf4534161bffe5033ce44fc7780c79d89), [`5e0556a`](https://github.com/LedgerHQ/ledger-live/commit/5e0556a3bd0ea60277462eed10c997b17b09d299), [`bce6610`](https://github.com/LedgerHQ/ledger-live/commit/bce6610ca8554a85f8f17b6014e921fdecd3fa4f), [`2a60165`](https://github.com/LedgerHQ/ledger-live/commit/2a601656b7a23a424a29f006ec53090648fdae4f), [`2d9f320`](https://github.com/LedgerHQ/ledger-live/commit/2d9f32087eea12ae9d5ea2347b277b8bf4e60f55), [`c56ab86`](https://github.com/LedgerHQ/ledger-live/commit/c56ab86ab65597caf87a09b7596faa54f3104bd4)]:
14
- - @ledgerhq/coin-framework@6.11.0-nightly.20251216024112
15
- - @ledgerhq/types-live@6.91.0-nightly.20251216024112
16
- - @ledgerhq/cryptoassets@13.35.0-nightly.20251216024112
17
- - @ledgerhq/errors@6.28.0-nightly.20251216024112
18
- - @ledgerhq/live-env@2.23.0-nightly.20251216024112
19
- - @ledgerhq/devices@8.8.0-nightly.20251216024112
20
- - @ledgerhq/types-cryptoassets@7.31.0-nightly.20251216024112
21
- - @ledgerhq/live-network@2.1.3-nightly.20251216024112
16
+ - @ledgerhq/coin-framework@6.11.0-nightly.20251217023943
17
+ - @ledgerhq/types-live@6.91.0-nightly.20251217023943
18
+ - @ledgerhq/cryptoassets@13.35.0-nightly.20251217023943
19
+ - @ledgerhq/errors@6.28.0-nightly.20251217023943
20
+ - @ledgerhq/live-env@2.23.0-nightly.20251217023943
21
+ - @ledgerhq/devices@8.8.0-nightly.20251217023943
22
+ - @ledgerhq/types-cryptoassets@7.31.0-nightly.20251217023943
23
+ - @ledgerhq/live-network@2.1.3-nightly.20251217023943
22
24
 
23
25
  ## 3.7.0
24
26
 
package/lib/logic/getCoinAndAmounts.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getCoinAndAmounts.d.ts","sourceRoot":"","sources":["../../src/logic/getCoinAndAmounts.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAKL,OAAO,EAKR,MAAM,cAAc,CAAC;AACtB,OAAO,EAIL,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAgB,2BAA2B,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAMtF,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAKhE;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAc9F;AAYD,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,2BAA2B,EACnC,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,IAAI,CAoBf;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,2BAA2B,EACnC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,IAAI,CAcf;AAED,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,gBAAgB,EACpB,OAAO,EAAE,MAAM,GACd;IACD,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,IAAI,EAAE,OAAO,CAAC;CACf,CA+EA"}
1
+ {"version":3,"file":"getCoinAndAmounts.d.ts","sourceRoot":"","sources":["../../src/logic/getCoinAndAmounts.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAKL,OAAO,EAKR,MAAM,cAAc,CAAC;AACtB,OAAO,EAIL,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAgB,2BAA2B,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAMtF,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAKhE;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAc9F;AAYD,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,2BAA2B,EACnC,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,IAAI,CAoBf;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,2BAA2B,EACnC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,IAAI,CAcf;AAED,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,gBAAgB,EACpB,OAAO,EAAE,MAAM,GACd;IACD,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,IAAI,EAAE,OAAO,CAAC;CACf,CAmFA"}
package/lib/logic/getCoinAndAmounts.js CHANGED
@@ -74,27 +74,29 @@ function getCoinAndAmounts(tx, address) {
74
74
  // Collect all events related to the address and calculate the overall amounts
75
75
  if (stakingTx) {
76
76
  tx.events.forEach(event => {
77
- if (constants_1.ADD_STAKE_EVENTS.includes(event.type) && tx.sender === address && amount_out.isZero()) {
77
+ if (constants_1.ADD_STAKE_EVENTS.includes(event.type) &&
78
+ compareAddress(tx.sender, address) &&
79
+ amount_out.isZero()) {
78
80
  coin_id = constants_1.APTOS_ASSET_ID;
79
81
  type = constants_1.OP_TYPE.STAKE;
80
82
  amount_out = amount_out.plus(event.data.amount_added || event.data.amount);
81
83
  }
82
84
  else if (constants_1.REACTIVATE_STAKE_EVENTS.includes(event.type) &&
83
- tx.sender === address &&
85
+ compareAddress(tx.sender, address) &&
84
86
  amount_out.isZero()) {
85
87
  coin_id = constants_1.APTOS_ASSET_ID;
86
88
  type = constants_1.OP_TYPE.STAKE;
87
89
  amount_out = amount_out.plus(event.data.amount_reactivated || event.data.amount);
88
90
  }
89
91
  else if (constants_1.UNLOCK_STAKE_EVENTS.includes(event.type) &&
90
- tx.sender === address &&
92
+ compareAddress(tx.sender, address) &&
91
93
  amount_in.isZero()) {
92
94
  coin_id = constants_1.APTOS_ASSET_ID;
93
95
  type = constants_1.OP_TYPE.UNSTAKE;
94
96
  amount_in = amount_in.plus(event.data.amount_unlocked || event.data.amount);
95
97
  }
96
98
  else if (constants_1.WITHDRAW_STAKE_EVENTS.includes(event.type) &&
97
- tx.sender === address &&
99
+ compareAddress(tx.sender, address) &&
98
100
  amount_in.isZero()) {
99
101
  coin_id = constants_1.APTOS_ASSET_ID;
100
102
  type = constants_1.OP_TYPE.WITHDRAW;
package/lib/logic/getCoinAndAmounts.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getCoinAndAmounts.js","sourceRoot":"","sources":["../../src/logic/getCoinAndAmounts.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getCoinAndAmounts.js","sourceRoot":"","sources":["../../src/logic/getCoinAndAmounts.ts"],"names":[],"mappings":"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"}
package/lib-es/logic/getCoinAndAmounts.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getCoinAndAmounts.d.ts","sourceRoot":"","sources":["../../src/logic/getCoinAndAmounts.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAKL,OAAO,EAKR,MAAM,cAAc,CAAC;AACtB,OAAO,EAIL,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAgB,2BAA2B,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAMtF,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAKhE;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAc9F;AAYD,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,2BAA2B,EACnC,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,IAAI,CAoBf;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,2BAA2B,EACnC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,IAAI,CAcf;AAED,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,gBAAgB,EACpB,OAAO,EAAE,MAAM,GACd;IACD,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,IAAI,EAAE,OAAO,CAAC;CACf,CA+EA"}
1
+ {"version":3,"file":"getCoinAndAmounts.d.ts","sourceRoot":"","sources":["../../src/logic/getCoinAndAmounts.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAKL,OAAO,EAKR,MAAM,cAAc,CAAC;AACtB,OAAO,EAIL,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAgB,2BAA2B,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAMtF,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAKhE;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAc9F;AAYD,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,2BAA2B,EACnC,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,IAAI,CAoBf;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,2BAA2B,EACnC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,IAAI,CAcf;AAED,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,gBAAgB,EACpB,OAAO,EAAE,MAAM,GACd;IACD,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,IAAI,EAAE,OAAO,CAAC;CACf,CAmFA"}
package/lib-es/logic/getCoinAndAmounts.js CHANGED
@@ -64,27 +64,29 @@ export function getCoinAndAmounts(tx, address) {
64
64
  // Collect all events related to the address and calculate the overall amounts
65
65
  if (stakingTx) {
66
66
  tx.events.forEach(event => {
67
- if (ADD_STAKE_EVENTS.includes(event.type) && tx.sender === address && amount_out.isZero()) {
67
+ if (ADD_STAKE_EVENTS.includes(event.type) &&
68
+ compareAddress(tx.sender, address) &&
69
+ amount_out.isZero()) {
68
70
  coin_id = APTOS_ASSET_ID;
69
71
  type = OP_TYPE.STAKE;
70
72
  amount_out = amount_out.plus(event.data.amount_added || event.data.amount);
71
73
  }
72
74
  else if (REACTIVATE_STAKE_EVENTS.includes(event.type) &&
73
- tx.sender === address &&
75
+ compareAddress(tx.sender, address) &&
74
76
  amount_out.isZero()) {
75
77
  coin_id = APTOS_ASSET_ID;
76
78
  type = OP_TYPE.STAKE;
77
79
  amount_out = amount_out.plus(event.data.amount_reactivated || event.data.amount);
78
80
  }
79
81
  else if (UNLOCK_STAKE_EVENTS.includes(event.type) &&
80
- tx.sender === address &&
82
+ compareAddress(tx.sender, address) &&
81
83
  amount_in.isZero()) {
82
84
  coin_id = APTOS_ASSET_ID;
83
85
  type = OP_TYPE.UNSTAKE;
84
86
  amount_in = amount_in.plus(event.data.amount_unlocked || event.data.amount);
85
87
  }
86
88
  else if (WITHDRAW_STAKE_EVENTS.includes(event.type) &&
87
- tx.sender === address &&
89
+ compareAddress(tx.sender, address) &&
88
90
  amount_in.isZero()) {
89
91
  coin_id = APTOS_ASSET_ID;
90
92
  type = OP_TYPE.WITHDRAW;
package/lib-es/logic/getCoinAndAmounts.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getCoinAndAmounts.js","sourceRoot":"","sources":["../../src/logic/getCoinAndAmounts.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getCoinAndAmounts.js","sourceRoot":"","sources":["../../src/logic/getCoinAndAmounts.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ledgerhq/coin-aptos",
3
- "version": "3.8.0-nightly.20251216024112",
3
+ "version": "3.8.0-nightly.20251217023943",
4
4
  "description": "Ledger Aptos Coin integration",
5
5
  "keywords": [
6
6
  "Ledger",
@@ -95,15 +95,15 @@
95
95
  "invariant": "^2.2.4",
96
96
  "lodash": "^4.17.21",
97
97
  "rxjs": "7.8.2",
98
- "@ledgerhq/coin-framework": "^6.11.0-nightly.20251216024112",
99
- "@ledgerhq/cryptoassets": "^13.35.0-nightly.20251216024112",
100
- "@ledgerhq/devices": "8.8.0-nightly.20251216024112",
101
- "@ledgerhq/errors": "^6.28.0-nightly.20251216024112",
102
- "@ledgerhq/live-env": "^2.23.0-nightly.20251216024112",
103
- "@ledgerhq/live-network": "^2.1.3-nightly.20251216024112",
98
+ "@ledgerhq/coin-framework": "^6.11.0-nightly.20251217023943",
99
+ "@ledgerhq/cryptoassets": "^13.35.0-nightly.20251217023943",
100
+ "@ledgerhq/devices": "8.8.0-nightly.20251217023943",
101
+ "@ledgerhq/errors": "^6.28.0-nightly.20251217023943",
102
+ "@ledgerhq/live-env": "^2.23.0-nightly.20251217023943",
103
+ "@ledgerhq/live-network": "^2.1.3-nightly.20251217023943",
104
104
  "@ledgerhq/logs": "^6.13.0",
105
- "@ledgerhq/types-cryptoassets": "^7.31.0-nightly.20251216024112",
106
- "@ledgerhq/types-live": "^6.91.0-nightly.20251216024112"
105
+ "@ledgerhq/types-cryptoassets": "^7.31.0-nightly.20251217023943",
106
+ "@ledgerhq/types-live": "^6.91.0-nightly.20251217023943"
107
107
  },
108
108
  "devDependencies": {
109
109
  "@faker-js/faker": "^9.4.0",
@@ -116,7 +116,7 @@
116
116
  "react": "18.3.1",
117
117
  "ts-jest": "^29.2.5",
118
118
  "@ledgerhq/disable-network-setup": "^0.1.0",
119
- "@ledgerhq/types-cryptoassets": "^7.31.0-nightly.20251216024112"
119
+ "@ledgerhq/types-cryptoassets": "^7.31.0-nightly.20251217023943"
120
120
  },
121
121
  "scripts": {
122
122
  "clean": "rimraf lib lib-es",
package/src/logic/getCoinAndAmounts.ts CHANGED
@@ -121,13 +121,17 @@ export function getCoinAndAmounts(
121
121
  // Collect all events related to the address and calculate the overall amounts
122
122
  if (stakingTx) {
123
123
  tx.events.forEach(event => {
124
- if (ADD_STAKE_EVENTS.includes(event.type) && tx.sender === address && amount_out.isZero()) {
124
+ if (
125
+ ADD_STAKE_EVENTS.includes(event.type) &&
126
+ compareAddress(tx.sender, address) &&
127
+ amount_out.isZero()
128
+ ) {
125
129
  coin_id = APTOS_ASSET_ID;
126
130
  type = OP_TYPE.STAKE;
127
131
  amount_out = amount_out.plus(event.data.amount_added || event.data.amount);
128
132
  } else if (
129
133
  REACTIVATE_STAKE_EVENTS.includes(event.type) &&
130
- tx.sender === address &&
134
+ compareAddress(tx.sender, address) &&
131
135
  amount_out.isZero()
132
136
  ) {
133
137
  coin_id = APTOS_ASSET_ID;
@@ -135,7 +139,7 @@ export function getCoinAndAmounts(
135
139
  amount_out = amount_out.plus(event.data.amount_reactivated || event.data.amount);
136
140
  } else if (
137
141
  UNLOCK_STAKE_EVENTS.includes(event.type) &&
138
- tx.sender === address &&
142
+ compareAddress(tx.sender, address) &&
139
143
  amount_in.isZero()
140
144
  ) {
141
145
  coin_id = APTOS_ASSET_ID;
@@ -143,7 +147,7 @@ export function getCoinAndAmounts(
143
147
  amount_in = amount_in.plus(event.data.amount_unlocked || event.data.amount);
144
148
  } else if (
145
149
  WITHDRAW_STAKE_EVENTS.includes(event.type) &&
146
- tx.sender === address &&
150
+ compareAddress(tx.sender, address) &&
147
151
  amount_in.isZero()
148
152
  ) {
149
153
  coin_id = APTOS_ASSET_ID;