@wormhole-foundation/wormhole-connect 3.0.0-beta.0-development → 3.0.0-beta.1-development

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 (135) hide show
  1. package/dist/main.js +49 -49
  2. package/dist/src/components/SampleApp/index.d.ts.map +1 -1
  3. package/dist/src/config/index.d.ts.map +1 -1
  4. package/dist/src/config/types.d.ts +2 -0
  5. package/dist/src/config/types.d.ts.map +1 -1
  6. package/dist/src/exports/executor.d.ts +2 -0
  7. package/dist/src/exports/executor.d.ts.map +1 -0
  8. package/dist/src/hooks/useFetchSupportedRoutes.d.ts.map +1 -1
  9. package/dist/src/utils/index.d.ts +1 -0
  10. package/dist/src/utils/index.d.ts.map +1 -1
  11. package/dist/src/utils/sdkv2.d.ts +0 -1
  12. package/dist/src/utils/sdkv2.d.ts.map +1 -1
  13. package/dist/src/views/v2/Bridge/Routes/SingleRoute.d.ts.map +1 -1
  14. package/dist/src/views/v2/Redeem/TransactionDetails/index.d.ts.map +1 -1
  15. package/dist/src/views/v2/Redeem/index.d.ts.map +1 -1
  16. package/lib/account-CKUCmcgT.mjs +30 -0
  17. package/lib/account-QG_Hi4er.js +1 -0
  18. package/lib/address-B-_yHNB2.js +1 -0
  19. package/lib/{address-D74XlMdi.mjs → address-B9anhmbU.mjs} +5 -5
  20. package/lib/address-Cj96wodd.mjs +64 -0
  21. package/lib/{address-DXFbgyJW.mjs → address-Drr_9OcK.mjs} +93 -93
  22. package/lib/aptos-BZ2mcuTd.js +2 -0
  23. package/lib/aptos-DPIwkCrX.mjs +68 -0
  24. package/lib/{aptos-WhWqMfkU.js → aptos-Da6iqpC-.js} +1 -1
  25. package/lib/{aptos-BckWT_Pe.mjs → aptos-Dz4Js3_d.mjs} +3 -3
  26. package/lib/{base64-DPCMLrON.mjs → base64-BcnUThiU.mjs} +1 -1
  27. package/lib/{blake2b-BmQx89Cf.mjs → blake2b-CnkNeJT4.mjs} +1 -1
  28. package/lib/{browser-ponyfill-Zjbs5ehD.mjs → browser-ponyfill-oWZrCgRw.mjs} +1 -1
  29. package/lib/{ccip-DiNEz9KN.js → ccip-Bb-IPrNA.js} +1 -1
  30. package/lib/{ccip-B45dpIhp.mjs → ccip-Ceg_B70t.mjs} +1 -1
  31. package/lib/{chain-DaAd2Ztf.mjs → chain-CNVMEdrk.mjs} +1 -1
  32. package/lib/{chunk-IMTC3J2M-Bn3rs7tb.mjs → chunk-IMTC3J2M-B7fKwIuX.mjs} +3 -3
  33. package/lib/{constants-CbKC2uxb.mjs → constants-Ba9GwEM1.mjs} +1 -1
  34. package/lib/constants-BqqwmYZc.js +1 -0
  35. package/lib/{contract-BI_HDILr.mjs → contract-DANWVftx.mjs} +1 -1
  36. package/lib/{create-CzWSWmF_.mjs → create-B9LwWha4.mjs} +1 -1
  37. package/lib/{evm-DFyxDQ-x.js → evm-1T5rGzcO.js} +3 -3
  38. package/lib/{evm-DgG5biHb.mjs → evm-B552wdhN.mjs} +9 -9
  39. package/lib/{evm-Es3E89UO.mjs → evm-DarNu22s.mjs} +9 -9
  40. package/lib/executor.d.ts +2 -0
  41. package/lib/executor.js +1 -0
  42. package/lib/executor.mjs +828 -0
  43. package/lib/hosted.js +1 -1
  44. package/lib/hosted.mjs +1 -1
  45. package/lib/index-2f5GRlqp.mjs +46 -0
  46. package/lib/{index-Blt9MjZK.mjs → index-B1XGfrNH.mjs} +1 -1
  47. package/lib/{index-DUiyW0v6.js → index-B40ktVOy.js} +1 -1
  48. package/lib/{index-jfL73ugq.mjs → index-B4NYDFvU.mjs} +5 -5
  49. package/lib/{index--QOOnO1S.mjs → index-BAuH_G93.mjs} +5 -5
  50. package/lib/{index-C9ZemP81.mjs → index-BHMN5Px3.mjs} +2 -2
  51. package/lib/{index-CGbZMLbJ.mjs → index-BO0DC-jc.mjs} +3 -3
  52. package/lib/{index-BziywkBj.mjs → index-BQ0RlDhv.mjs} +246 -272
  53. package/lib/{index-Cuu-xM0U.mjs → index-BR4w3fuE.mjs} +5 -5
  54. package/lib/{index-DnOkd5VL.js → index-BTNmmLkb.js} +1 -1
  55. package/lib/{index-BQwsEzas.mjs → index-BlJpOhTM.mjs} +5 -5
  56. package/lib/{index-CjL3WbDp.js → index-Blzzdktm.js} +1 -1
  57. package/lib/{index-Bc7EWiox.js → index-Bn1o04G7.js} +80 -80
  58. package/lib/index-C2Pe6i5V.js +1 -0
  59. package/lib/{index-5xE5bjpW.mjs → index-C9XIIFQK.mjs} +1 -1
  60. package/lib/{index-XFRw6zfV.mjs → index-CCRPy0B_.mjs} +2 -2
  61. package/lib/index-CE0rxdUf.js +1 -0
  62. package/lib/{index-Bu6LLuxH.mjs → index-CEXcD8Mw.mjs} +4 -4
  63. package/lib/{index-BLYjmYmu.mjs → index-CKg04pdA.mjs} +5 -5
  64. package/lib/{index-CxW1HjrT.mjs → index-CM_IP492.mjs} +14 -14
  65. package/lib/{index-pjyIirVB.mjs → index-CT2-qOL1.mjs} +2 -2
  66. package/lib/{index-DFHQnDR7.mjs → index-CYdhveYx.mjs} +6 -6
  67. package/lib/{index-COkWxUoe.mjs → index-Cda4HnP1.mjs} +5 -5
  68. package/lib/{index-BYzONVwG.mjs → index-CfC3_uPF.mjs} +7 -7
  69. package/lib/index-DC1ot7tO.js +1 -0
  70. package/lib/{index-v0MO46Zl.mjs → index-DHAgduQ-.mjs} +4 -4
  71. package/lib/{index-DQjqwKVk.mjs → index-DSSOE7Me.mjs} +2 -2
  72. package/lib/{index-BbCcdl9J.mjs → index-DoFo485M.mjs} +73 -72
  73. package/lib/{index-BNjB0Q50.mjs → index-DvxmZnxH.mjs} +5 -5
  74. package/lib/{index-ju2wtFjy.mjs → index-Dw7INWis.mjs} +7 -7
  75. package/lib/{index-t94-e3qG.js → index-VhcNuaP6.js} +1 -1
  76. package/lib/index-dpkTW-H8.js +1 -0
  77. package/lib/index-f_27F6WX.js +1 -0
  78. package/lib/{index-BkHLwIMc.mjs → index-l0sxQXRT.mjs} +1 -1
  79. package/lib/{index-CdOqWihR.mjs → index-mXHkgOxH.mjs} +4 -4
  80. package/lib/{index-C2jOUiub.mjs → index-pN0Dgjjf.mjs} +5 -5
  81. package/lib/{index-B7U-me-L.mjs → index-pNqQSm4p.mjs} +6628 -6659
  82. package/lib/{index.es-BYLVcsBS.js → index.es-_N4sKEIC.js} +1 -1
  83. package/lib/{index.es-BrgiiIYV.mjs → index.es-rEir51oG.mjs} +7 -7
  84. package/lib/index.js +1 -1
  85. package/lib/index.mjs +5 -5
  86. package/lib/mayan.mjs +10 -10
  87. package/lib/{mint-BjwZUbPm.mjs → mint-DVxIczlI.mjs} +2 -2
  88. package/lib/ntt.js +1 -1
  89. package/lib/ntt.mjs +10 -10
  90. package/lib/{platform-pi9E7cPR.mjs → platform-CbDx4hex.mjs} +4 -4
  91. package/lib/platform-CyTWPtDR.js +1 -0
  92. package/lib/{platform-C-edrCmf.mjs → platform-D-nUFU0e.mjs} +6 -6
  93. package/lib/platform-PaIJsXKV.mjs +118 -0
  94. package/lib/{provider-jsonrpc-BjcoR80W.mjs → provider-jsonrpc-C_IZFSfB.mjs} +2 -2
  95. package/lib/{sha3-B1KxiAa7.mjs → sha3-DQQvDwj1.mjs} +1 -1
  96. package/lib/{signer-CgLO7fBA.mjs → signer-CsMX8mEc.mjs} +6 -6
  97. package/lib/{solana-DA48rYUK.js → solana-BRQmi9BN.js} +1 -1
  98. package/lib/solana-C_0khyJw.mjs +18 -0
  99. package/lib/{solana-Pjpx_PkM.js → solana-CrjSp_Zk.js} +1 -1
  100. package/lib/{solana-CvaeYBIB.mjs → solana-SQhnN3yB.mjs} +6 -6
  101. package/lib/{solanaEmbed.esm-jxAhxZ9V.js → solanaEmbed.esm-B7IRXgnI.js} +1 -1
  102. package/lib/{solanaEmbed.esm-Gti-Nr19.mjs → solanaEmbed.esm-Din0Z51P.mjs} +3 -3
  103. package/lib/src/components/SampleApp/index.d.ts.map +1 -1
  104. package/lib/src/config/index.d.ts.map +1 -1
  105. package/lib/src/config/types.d.ts +2 -0
  106. package/lib/src/config/types.d.ts.map +1 -1
  107. package/lib/src/exports/executor.d.ts +2 -0
  108. package/lib/src/exports/executor.d.ts.map +1 -0
  109. package/lib/src/hooks/useFetchSupportedRoutes.d.ts.map +1 -1
  110. package/lib/src/utils/index.d.ts +1 -0
  111. package/lib/src/utils/index.d.ts.map +1 -1
  112. package/lib/src/utils/sdkv2.d.ts +0 -1
  113. package/lib/src/utils/sdkv2.d.ts.map +1 -1
  114. package/lib/src/views/v2/Bridge/Routes/SingleRoute.d.ts.map +1 -1
  115. package/lib/src/views/v2/Redeem/TransactionDetails/index.d.ts.map +1 -1
  116. package/lib/src/views/v2/Redeem/index.d.ts.map +1 -1
  117. package/lib/{sui-CuwmPzXZ.mjs → sui-BSLo7-bI.mjs} +14 -14
  118. package/lib/{sui-Bi1J0W_P.mjs → sui-BePFnRSc.mjs} +3 -3
  119. package/lib/{sui-uSCH-o_h.js → sui-C7KPm3kD.js} +1 -1
  120. package/lib/{tokens-DcqY0jHv.js → tokens-CChVRIuE.js} +1 -1
  121. package/lib/{tokens-DOx4hiaR.mjs → tokens-CyKAZUN-.mjs} +4 -4
  122. package/lib/{units-YO78Cq5F.mjs → units-DP5zqyxn.mjs} +9 -9
  123. package/lib/{unsignedTransaction-Cj476rGh.mjs → unsignedTransaction-fSrwDjHx.mjs} +9 -9
  124. package/lib/{web3--AtxvLIy.mjs → web3-DCo8oN-v.mjs} +4 -4
  125. package/package.json +16 -1
  126. package/lib/aptos-VwYOwtQy.mjs +0 -179
  127. package/lib/aptos-hc5GrCHO.js +0 -2
  128. package/lib/constants-Cib4VRZO.js +0 -1
  129. package/lib/index-BlzRxQ82.js +0 -1
  130. package/lib/index-CJXmILJz.js +0 -1
  131. package/lib/index-C_dsyQjC.mjs +0 -46
  132. package/lib/index-CpuzvBlL.js +0 -1
  133. package/lib/index-Cxg2C7RE.js +0 -1
  134. package/lib/index-DDAGOrv0.js +0 -1
  135. package/lib/solana-qHqB-cdc.mjs +0 -18
@@ -1,15 +1,16 @@
1
1
  var Pt = Object.defineProperty;
2
2
  var _t = (e, t, r) => t in e ? Pt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
3
3
  var f = (e, t, r) => _t(e, typeof t != "symbol" ? t + "" : t, r);
4
- import { i as b, j as ye, k as Wt, n as It, l as Q, m as Ut, h as H, d as Z, B as Nt, o as Ft, p as xt, q as Se, g as zt, S as Ot, r as Lt, s as qt } from "./index-BziywkBj.mjs";
5
- import { ae as c, d as l, ar as A, as as le, au as z, aG as V, cz as Ge, cA as He, aw as Dt, av as Kt, aH as Vt, aI as Gt, aq as O, an as E, aP as y, a0 as Ht, _ as dt, ap as Zt, aX as v, b1 as k, cv as Ce, aA as Yt, k as $, a6 as Be, ao as ae, b2 as L, $ as Qt, b3 as lt } from "./address-DXFbgyJW.mjs";
6
- import { P as ft, c as Xt } from "./index-BkHLwIMc.mjs";
7
- import { u as U, b as G, p as S } from "./web3--AtxvLIy.mjs";
8
- import { a as oe, S as mt } from "./unsignedTransaction-Cj476rGh.mjs";
9
- import { r as gt } from "./chain-DaAd2Ztf.mjs";
4
+ import { i as Wt, j as It, h as H, d as Z, B as Ut, k as Nt, l as Ft, m as ye, g as xt, S as zt, n as Ot, o as Lt } from "./index-BQ0RlDhv.mjs";
5
+ import { ae as c, d as l, ar as A, as as le, au as z, aG as V, cz as Ge, cA as He, aw as Dt, av as qt, aH as Kt, aI as Vt, aq as O, an as E, aP as y, a0 as Gt, _ as dt, ap as Ht, aX as v, b1 as k, cv as Ce, aA as Zt, k as $, a6 as Be, ao as ae, b2 as L, $ as Yt, b3 as lt } from "./address-Drr_9OcK.mjs";
6
+ import { P as ft, c as Qt } from "./index-l0sxQXRT.mjs";
7
+ import { d as b, g as Se, n as Xt, a as Q } from "./account-CKUCmcgT.mjs";
8
+ import { u as U, b as G, p as S } from "./web3-DCo8oN-v.mjs";
9
+ import { a as oe, S as mt } from "./unsignedTransaction-fSrwDjHx.mjs";
10
+ import { r as gt } from "./chain-CNVMEdrk.mjs";
10
11
  const M = new c("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
11
12
  new c("TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb");
12
- const Ae = new c("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"), q = new c("So11111111111111111111111111111111111111112");
13
+ const Ae = new c("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"), D = new c("So11111111111111111111111111111111111111112");
13
14
  new c("9pan9bMn5HatX4EJdBwg9VgCa7Uz5HL8N1m5D3NdXejP");
14
15
  class ee extends Error {
15
16
  constructor(t) {
@@ -236,12 +237,12 @@ const vn = A([
236
237
  $e("newerTransferFee")
237
238
  ]), Bn = vn.span, Rn = A([U("withheldAmount")]), En = Rn.span, Pn = A([S("authority"), S("programId")]), _n = Pn.span, Wn = A([G("transferring")]), In = Wn.span, je = A([
238
239
  z("discriminator"),
239
- Kt(32, "addressConfig"),
240
+ qt(32, "addressConfig"),
240
241
  G("isSigner"),
241
242
  G("isWritable")
242
243
  ]), Un = A([
243
244
  V("count"),
244
- Vt(je, Gt(je.span), "extraAccounts")
245
+ Kt(je, Vt(je.span), "extraAccounts")
245
246
  ]);
246
247
  A([
247
248
  U("instructionDiscriminator"),
@@ -347,7 +348,7 @@ function Ie(e, t) {
347
348
  const r = l.Buffer.alloc(2);
348
349
  return r.writeUInt16BE(y(t)), b([l.Buffer.from("foreign_contract"), r], e);
349
350
  }
350
- function qn(e) {
351
+ function Dn(e) {
351
352
  return b([l.Buffer.from("redeemer")], e);
352
353
  }
353
354
  function Ue(e, t) {
@@ -363,14 +364,14 @@ function Tt(e, t, r) {
363
364
  return b([
364
365
  l.Buffer.from("bridged"),
365
366
  new c(t).toBuffer(),
366
- l.Buffer.from(Ht.toBytes(BigInt(r.toString()), 8))
367
+ l.Buffer.from(Gt.toBytes(BigInt(r.toString()), 8))
367
368
  ], e);
368
369
  }
369
370
  function B(e) {
370
371
  return b([l.Buffer.from("config")], e);
371
372
  }
372
- async function Ir(e, t, r) {
373
- return e.getAccountInfo(B(t), r).then((n) => Ne.deserialize(ye(n)));
373
+ async function Ur(e, t, r) {
374
+ return e.getAccountInfo(B(t), r).then((n) => Ne.deserialize(Se(n)));
374
375
  }
375
376
  class Ne {
376
377
  constructor(t) {
@@ -399,8 +400,8 @@ function te(e, t, r) {
399
400
  n
400
401
  ], e);
401
402
  }
402
- async function Ur(e, t, r) {
403
- return e.getAccountInfo(new c(t), r).then((n) => Fe.deserialize(ye(n)));
403
+ async function Nr(e, t, r) {
404
+ return e.getAccountInfo(new c(t), r).then((n) => Fe.deserialize(Se(n)));
404
405
  }
405
406
  class Fe {
406
407
  constructor(t, r) {
@@ -446,7 +447,7 @@ function Y(e, t) {
446
447
  return b([l.Buffer.from("meta"), new c(t).toBuffer()], e);
447
448
  }
448
449
  async function me(e, t, r, n) {
449
- return e.getAccountInfo(Y(t, r), n).then((i) => Oe.deserialize(ye(i)));
450
+ return e.getAccountInfo(Y(t, r), n).then((i) => Oe.deserialize(Se(i)));
450
451
  }
451
452
  class Oe {
452
453
  constructor(t, r, n, i) {
@@ -466,7 +467,7 @@ class Oe {
466
467
  function it(e, t, r, n) {
467
468
  return jt(new c(t), ne(e), new c(r), n);
468
469
  }
469
- class Dn {
470
+ class qn {
470
471
  constructor(t) {
471
472
  f(this, "idl");
472
473
  this.idl = t;
@@ -639,7 +640,7 @@ class ir {
639
640
  f(this, "state");
640
641
  f(this, "events");
641
642
  f(this, "types");
642
- this.instruction = new Vn(t), this.accounts = new Dn(t), this.state = new nr(t), this.events = new Kn(t), this.types = new rr(t);
643
+ this.instruction = new Vn(t), this.accounts = new qn(t), this.state = new nr(t), this.events = new Kn(t), this.types = new rr(t);
643
644
  }
644
645
  }
645
646
  const vt = {
@@ -1583,7 +1584,7 @@ function ar(e, t) {
1583
1584
  return new ft(vt, new c(e), t === void 0 ? { connection: null } : t, sr());
1584
1585
  }
1585
1586
  function W(e, t) {
1586
- return ar(e, Xt(t));
1587
+ return ar(e, Qt(t));
1587
1588
  }
1588
1589
  function sr() {
1589
1590
  return new ir(vt);
@@ -1677,7 +1678,7 @@ const we = class we {
1677
1678
  }
1678
1679
  static createMetadataAccounts(t, r, n, i, a, o, s = !1, d, u, m, h = !1, g = be(r)) {
1679
1680
  const w = [
1680
- It(g, !1),
1681
+ Xt(g, !1),
1681
1682
  Q(r, !1),
1682
1683
  Q(n, !0),
1683
1684
  Q(t, !0),
@@ -1723,8 +1724,8 @@ class Le {
1723
1724
  return new Le(r, n, i, a, s, d);
1724
1725
  }
1725
1726
  }
1726
- async function Nr(e, t, r) {
1727
- return e.getAccountInfo(be(t), r).then((n) => Le.deserialize(ye(n)));
1727
+ async function Fr(e, t, r) {
1728
+ return e.getAccountInfo(be(t), r).then((n) => Le.deserialize(Se(n)));
1728
1729
  }
1729
1730
  function or(e, t, r, n, i, a, o) {
1730
1731
  const s = W(t, e).methods.attestToken(o);
@@ -1737,7 +1738,7 @@ function or(e, t, r, n, i, a, o) {
1737
1738
  });
1738
1739
  }
1739
1740
  function st(e, t, r, n, i) {
1740
- const { bridge: a, emitter: o, sequence: s, feeCollector: d, clock: u, rent: m, systemProgram: h } = Ut(t, r, i, e);
1741
+ const { bridge: a, emitter: o, sequence: s, feeCollector: d, clock: u, rent: m, systemProgram: h } = It(t, r, i, e);
1741
1742
  return {
1742
1743
  payer: new c(r),
1743
1744
  config: B(e),
@@ -1842,7 +1843,7 @@ function fr(e, t, r, n) {
1842
1843
  wormholeProgram: new c(t)
1843
1844
  };
1844
1845
  }
1845
- function Fr(e, t, r) {
1846
+ function xr(e, t, r) {
1846
1847
  const n = W(e).methods.initialize(r);
1847
1848
  return n._ixFn(...n._args, {
1848
1849
  accounts: mr(e, t),
@@ -1860,7 +1861,7 @@ function mr(e, t) {
1860
1861
  systemProgram: E.programId
1861
1862
  };
1862
1863
  }
1863
- function xr(e, t, r, n) {
1864
+ function zr(e, t, r, n) {
1864
1865
  const i = W(e).methods.registerChain();
1865
1866
  return i._ixFn(...i._args, {
1866
1867
  accounts: gr(e, t, r, n),
@@ -1882,7 +1883,7 @@ function gr(e, t, r, n) {
1882
1883
  wormholeProgram: new c(t)
1883
1884
  };
1884
1885
  }
1885
- function zr(e, t, r, n, i) {
1886
+ function Or(e, t, r, n, i) {
1886
1887
  const a = W(e).methods.upgradeContract();
1887
1888
  return a._ixFn(...a._args, {
1888
1889
  accounts: hr(e, t, r, n, i),
@@ -1897,14 +1898,14 @@ function hr(e, t, r, n, i) {
1897
1898
  payer: new c(r),
1898
1899
  vaa: Z(t, l.Buffer.from(n.hash)),
1899
1900
  claim: H(e, n.emitterAddress.toUint8Array(), y(n.emitterChain), n.sequence),
1900
- upgradeAuthority: xt(e),
1901
+ upgradeAuthority: Ft(e),
1901
1902
  spill: new c(i === void 0 ? r : i),
1902
1903
  implementation: new c(n.payload.actionArgs.newContract),
1903
- programData: Ft(e),
1904
+ programData: Nt(e),
1904
1905
  tokenBridgeProgram: new c(e),
1905
1906
  rent: O,
1906
- clock: Zt,
1907
- bpfLoaderUpgradeable: Nt,
1907
+ clock: Ht,
1908
+ bpfLoaderUpgradeable: Ut,
1908
1909
  systemProgram: E.programId
1909
1910
  };
1910
1911
  }
@@ -1919,7 +1920,7 @@ function ct(e, t, r, n, i, a, o, s, d, u, m, h) {
1919
1920
  });
1920
1921
  }
1921
1922
  function pr(e, t, r, n, i, a) {
1922
- const { wormholeBridge: o, wormholeMessage: s, wormholeEmitter: d, wormholeSequence: u, wormholeFeeCollector: m, clock: h, rent: g, systemProgram: w } = Se(e, t, r, n);
1923
+ const { wormholeBridge: o, wormholeMessage: s, wormholeEmitter: d, wormholeSequence: u, wormholeFeeCollector: m, clock: h, rent: g, systemProgram: w } = ye(e, t, r, n);
1923
1924
  return {
1924
1925
  payer: new c(r),
1925
1926
  config: B(e),
@@ -1951,7 +1952,7 @@ function ut(e, t, r, n, i, a, o, s, d, u, m, h) {
1951
1952
  });
1952
1953
  }
1953
1954
  function Bt(e, t, r, n, i, a, o) {
1954
- const { wormholeBridge: s, wormholeMessage: d, wormholeEmitter: u, wormholeSequence: m, wormholeFeeCollector: h, clock: g, rent: w, systemProgram: p } = Se(e, t, r, n);
1955
+ const { wormholeBridge: s, wormholeMessage: d, wormholeEmitter: u, wormholeSequence: m, wormholeFeeCollector: h, clock: g, rent: w, systemProgram: p } = ye(e, t, r, n);
1955
1956
  return {
1956
1957
  payer: new c(r),
1957
1958
  config: B(e),
@@ -1984,7 +1985,7 @@ function wr(e, t, r, n, i, a, o, s, d, u, m, h, g, w) {
1984
1985
  });
1985
1986
  }
1986
1987
  function yr(e, t, r, n, i, a, o, s) {
1987
- const d = re(e, o, s), { wormholeBridge: u, wormholeMessage: m, wormholeEmitter: h, wormholeSequence: g, wormholeFeeCollector: w, clock: p, rent: C, systemProgram: R } = Se(e, t, r, n);
1988
+ const d = re(e, o, s), { wormholeBridge: u, wormholeMessage: m, wormholeEmitter: h, wormholeSequence: g, wormholeFeeCollector: w, clock: p, rent: C, systemProgram: R } = ye(e, t, r, n);
1988
1989
  return {
1989
1990
  payer: new c(r),
1990
1991
  config: B(e),
@@ -2016,7 +2017,7 @@ function Sr(e, t, r, n, i, a, o, s, d, u, m, h, g, w) {
2016
2017
  });
2017
2018
  }
2018
2019
  function Rt(e, t, r, n, i, a, o, s, d) {
2019
- const u = re(e, o, s), { wormholeBridge: m, wormholeMessage: h, wormholeEmitter: g, wormholeSequence: w, wormholeFeeCollector: p, clock: C, rent: R, systemProgram: F } = Se(e, t, r, n);
2020
+ const u = re(e, o, s), { wormholeBridge: m, wormholeMessage: h, wormholeEmitter: g, wormholeSequence: w, wormholeFeeCollector: p, clock: C, rent: R, systemProgram: F } = ye(e, t, r, n);
2020
2021
  return {
2021
2022
  payer: new c(r),
2022
2023
  config: B(e),
@@ -2038,8 +2039,8 @@ function Rt(e, t, r, n, i, a, o, s, d) {
2038
2039
  tokenProgram: M
2039
2040
  };
2040
2041
  }
2041
- function Or(e, t, r) {
2042
- const { wormholeEmitter: n, wormholeBridge: i, wormholeFeeCollector: a, wormholeSequence: o } = zt(t, r);
2042
+ function Lr(e, t, r) {
2043
+ const { wormholeEmitter: n, wormholeBridge: i, wormholeFeeCollector: a, wormholeSequence: o } = xt(t, r);
2043
2044
  return {
2044
2045
  tokenBridgeConfig: B(t),
2045
2046
  tokenBridgeAuthoritySigner: ne(t),
@@ -2099,7 +2100,7 @@ function Mr(e, t, r, n, i, a, o, s, d) {
2099
2100
  wormholeProgram: u.wormholeProgram
2100
2101
  };
2101
2102
  }
2102
- function Lr(e, t, r, n, i) {
2103
+ function Dr(e, t, r, n, i) {
2103
2104
  const a = new c(n.payload.token.address.toUint8Array()), o = new c(n.payload.to.address.toUint8Array());
2104
2105
  return {
2105
2106
  payer: new c(r),
@@ -4121,16 +4122,16 @@ const kr = {
4121
4122
  }
4122
4123
  ]
4123
4124
  };
4124
- function qe(e, t) {
4125
+ function De(e, t) {
4125
4126
  return new ft(kr, new c(e), { connection: t });
4126
4127
  }
4127
4128
  function Et(e, t) {
4128
4129
  return b([l.Buffer.from("seq"), new c(t).toBuffer()], e);
4129
4130
  }
4130
4131
  async function Tr(e, t, r, n, i, a, o, s, d, u, m, h) {
4131
- const { methods: { transferNativeTokensWithRelay: g }, account: { signerSequence: w } } = qe(t, e), p = Et(t, r), C = await w.fetch(p).then(({ value: x }) => x).catch((x) => {
4132
- var D;
4133
- if ((D = x.message) != null && D.includes("Account does not exist"))
4132
+ const { methods: { transferNativeTokensWithRelay: g }, account: { signerSequence: w } } = De(t, e), p = Et(t, r), C = await w.fetch(p).then(({ value: x }) => x).catch((x) => {
4133
+ var q;
4134
+ if ((q = x.message) != null && q.includes("Account does not exist"))
4134
4135
  return new v(0);
4135
4136
  throw x;
4136
4137
  }), R = Tt(t, r, C), F = We(new c(a), new c(r)), I = kt(t, a), ie = Ar(t, n, i, r, R, F, a);
@@ -4145,11 +4146,11 @@ async function Tr(e, t, r, n, i, a, o, s, d, u, m, h) {
4145
4146
  }).instruction();
4146
4147
  }
4147
4148
  async function br(e, t, r, n, i, a, o, s, d, u, m) {
4148
- const { methods: { transferWrappedTokensWithRelay: h }, account: { signerSequence: g } } = qe(t, e), w = Et(t, r), p = await g.fetch(w).then(({ value: D }) => D).catch((D) => {
4149
+ const { methods: { transferWrappedTokensWithRelay: h }, account: { signerSequence: g } } = De(t, e), w = Et(t, r), p = await g.fetch(w).then(({ value: q }) => q).catch((q) => {
4149
4150
  var Ve;
4150
- if ((Ve = D.message) != null && Ve.includes("Account does not exist"))
4151
+ if ((Ve = q.message) != null && Ve.includes("Account does not exist"))
4151
4152
  return new v(0);
4152
- throw D;
4153
+ throw q;
4153
4154
  }), C = Tt(t, r, p), R = We(new c(a), new c(r)), { chain: F, tokenAddress: I } = await me(e, n, a), ie = kt(t, a), x = Mr(t, n, i, r, C, R, F, I);
4154
4155
  return h(new v(o.toString()), new v(s.toString()), y(u), [...d], m).accounts({
4155
4156
  config: Mt(t),
@@ -4161,7 +4162,7 @@ async function br(e, t, r, n, i, a, o, s, d, u, m) {
4161
4162
  ...x
4162
4163
  }).instruction();
4163
4164
  }
4164
- class De {
4165
+ class qe {
4165
4166
  constructor(t, r, n, i) {
4166
4167
  f(this, "network");
4167
4168
  f(this, "chain");
@@ -4174,13 +4175,13 @@ class De {
4174
4175
  const a = i.tokenBridge;
4175
4176
  if (!a)
4176
4177
  throw new Error(`TokenBridge contract Address for chain ${r} not found`);
4177
- this.tokenBridge = W(a, n), this.coreBridge = new Ot(t, r, n, i);
4178
+ this.tokenBridge = W(a, n), this.coreBridge = new zt(t, r, n, i);
4178
4179
  }
4179
4180
  static async fromRpc(t, r) {
4180
4181
  const [n, i] = await oe.chainFromRpc(t), a = r[i];
4181
4182
  if (a.network !== n)
4182
4183
  throw new Error(`Network mismatch for chain ${i}: ${a.network} != ${n}`);
4183
- return new De(n, i, t, a.contracts);
4184
+ return new qe(n, i, t, a.contracts);
4184
4185
  }
4185
4186
  async isWrappedAsset(t) {
4186
4187
  return me(this.connection, this.tokenBridge.programId, new k(t).toUint8Array()).catch((r) => null).then((r) => r != null);
@@ -4195,7 +4196,7 @@ class De {
4195
4196
  chain: this.chain,
4196
4197
  address: new k(n.toBytes()).toUniversalAddress()
4197
4198
  } : {
4198
- chain: Yt(i.chain),
4199
+ chain: Zt(i.chain),
4199
4200
  address: new dt(new Uint8Array(i.tokenAddress))
4200
4201
  };
4201
4202
  } catch {
@@ -4226,15 +4227,15 @@ class De {
4226
4227
  throw Ce(`${r}: ${t.address.toUniversalAddress().toString()}`);
4227
4228
  }
4228
4229
  async isTransferCompleted(t) {
4229
- return Lt(this.connection, this.tokenBridge.programId, t.emitterAddress.toUint8Array(), y(t.emitterChain), t.sequence, this.connection.commitment).catch(() => !1);
4230
+ return Ot(this.connection, this.tokenBridge.programId, t.emitterAddress.toUint8Array(), y(t.emitterChain), t.sequence, this.connection.commitment).catch(() => !1);
4230
4231
  }
4231
4232
  async getWrappedNative() {
4232
- return Be(this.chain, q.toBase58());
4233
+ return Be(this.chain, D.toBase58());
4233
4234
  }
4234
4235
  async *createAttestation(t, r) {
4235
4236
  if (!r)
4236
4237
  throw new Error("Payer required to create attestation");
4237
- const n = new k(r).unwrap(), i = 0, a = await this.coreBridge.getMessageFee(), o = qt(this.coreBridge.coreBridge.programId, n, a), s = ae.generate(), d = or(this.connection, this.tokenBridge.programId, this.coreBridge.address, n, new k(t).unwrap(), s.publicKey, i), u = new L().add(o, d);
4238
+ const n = new k(r).unwrap(), i = 0, a = await this.coreBridge.getMessageFee(), o = Lt(this.coreBridge.coreBridge.programId, n, a), s = ae.generate(), d = or(this.connection, this.tokenBridge.programId, this.coreBridge.address, n, new k(t).unwrap(), s.publicKey, i), u = new L().add(o, d);
4238
4239
  u.feePayer = n, yield this.createUnsignedTx({ transaction: u, signers: [s] }, "Solana.AttestToken");
4239
4240
  }
4240
4241
  async *submitAttestation(t, r) {
@@ -4257,7 +4258,7 @@ class De {
4257
4258
  fromPubkey: o,
4258
4259
  lamports: n,
4259
4260
  toPubkey: g.publicKey
4260
- }), R = nt(g.publicKey, q, o), F = it(this.tokenBridge.programId, g.publicKey, o, n), I = i ? ut(this.connection, this.tokenBridge.programId, this.coreBridge.address, a, h.publicKey, g.publicKey, q, u, n, s, d, i) : ct(this.connection, this.tokenBridge.programId, this.coreBridge.address, a, h.publicKey, g.publicKey, q, u, n, m, s, d), ie = Qe(
4261
+ }), R = nt(g.publicKey, D, o), F = it(this.tokenBridge.programId, g.publicKey, o, n), I = i ? ut(this.connection, this.tokenBridge.programId, this.coreBridge.address, a, h.publicKey, g.publicKey, D, u, n, s, d, i) : ct(this.connection, this.tokenBridge.programId, this.coreBridge.address, a, h.publicKey, g.publicKey, D, u, n, m, s, d), ie = Qe(
4261
4262
  g.publicKey,
4262
4263
  //account to close
4263
4264
  o,
@@ -4285,14 +4286,14 @@ class De {
4285
4286
  F.feePayer = s, yield this.createUnsignedTx({ transaction: F, signers: [p] }, "TokenBridge.TransferTokens");
4286
4287
  }
4287
4288
  async *redeemAndUnwrap(t, r) {
4288
- const n = new k(t).unwrap(), i = new k(r.payload.to.address).unwrap(), a = await an(this.connection, q).then((p) => r.payload.token.amount * BigInt(Math.pow(10, p.decimals - 8))), o = await Xe(this.connection), s = ae.generate(), d = ot(this.connection, this.tokenBridge.programId, this.coreBridge.address, n, r), u = E.createAccount({
4289
+ const n = new k(t).unwrap(), i = new k(r.payload.to.address).unwrap(), a = await an(this.connection, D).then((p) => r.payload.token.amount * BigInt(Math.pow(10, p.decimals - 8))), o = await Xe(this.connection), s = ae.generate(), d = ot(this.connection, this.tokenBridge.programId, this.coreBridge.address, n, r), u = E.createAccount({
4289
4290
  fromPubkey: n,
4290
4291
  newAccountPubkey: s.publicKey,
4291
4292
  lamports: o,
4292
4293
  //spl token accounts need rent exemption
4293
4294
  space: _,
4294
4295
  programId: M
4295
- }), m = nt(s.publicKey, q, n), h = Ln(i, s.publicKey, n, a.valueOf()), g = Qe(
4296
+ }), m = nt(s.publicKey, D, n), h = Ln(i, s.publicKey, n, a.valueOf()), g = Qe(
4296
4297
  s.publicKey,
4297
4298
  //account to close
4298
4299
  n,
@@ -4312,7 +4313,7 @@ class De {
4312
4313
  const i = r.payload.token.chain === this.chain ? r.payload.token.address : (await this.getWrappedAsset(r.payload.token)).toUniversalAddress();
4313
4314
  if (yield* this.createAta(t, i), yield* this.coreBridge.postVaa(t, r), n) {
4314
4315
  const d = new k(await this.getWrappedNative());
4315
- if (Qt.equals(i.toUint8Array(), d.toUint8Array())) {
4316
+ if (Yt.equals(i.toUint8Array(), d.toUint8Array())) {
4316
4317
  yield* this.redeemAndUnwrap(t, r);
4317
4318
  return;
4318
4319
  }
@@ -4368,7 +4369,7 @@ class Ke {
4368
4369
  const a = i.tokenBridgeRelayer;
4369
4370
  if (!a)
4370
4371
  throw new Error(`TokenBridge contract Address for chain ${r} not found`);
4371
- this.tokenBridgeRelayer = qe(a, n), this.tokenBridgeProgramId = new c(i.tokenBridge), this.coreBridgeProgramId = new c(i.coreBridge);
4372
+ this.tokenBridgeRelayer = De(a, n), this.tokenBridgeProgramId = new c(i.tokenBridge), this.coreBridgeProgramId = new c(i.coreBridge);
4372
4373
  }
4373
4374
  static async fromRpc(t, r) {
4374
4375
  const [n, i] = await oe.chainFromRpc(t), a = r[i];
@@ -4408,7 +4409,7 @@ class Ke {
4408
4409
  async maxSwapAmount(t) {
4409
4410
  const r = this.mintAddress(t), [{ swapRate: n, maxNativeSwapAmount: i }, { swapRate: a }] = await Promise.all([
4410
4411
  this.getRegisteredToken(r),
4411
- this.getRegisteredToken(q)
4412
+ this.getRegisteredToken(D)
4412
4413
  ]), o = Number(await oe.getDecimals(this.chain, this.connection, t)), s = this.calculateNativeSwapRate(a, n), d = o > X ? i.mul(s).mul(se.pow(new v(o - X))).div(J) : i.mul(s).div(se.pow(new v(X - o)).mul(J));
4413
4414
  return BigInt(d.toString());
4414
4415
  }
@@ -4417,7 +4418,7 @@ class Ke {
4417
4418
  return 0n;
4418
4419
  const n = this.mintAddress(t), i = Number(await oe.getDecimals(this.chain, this.connection, t)), [{ swapRate: a }, { swapRate: o }] = await Promise.all([
4419
4420
  this.getRegisteredToken(n),
4420
- this.getRegisteredToken(q)
4421
+ this.getRegisteredToken(D)
4421
4422
  ]), s = this.calculateNativeSwapRate(o, a), d = i > X ? J.mul(new v(r.toString())).div(s.mul(se.pow(new v(i - X)))) : J.mul(new v(r.toString())).mul(se.pow(new v(X - i))).div(s);
4422
4423
  return BigInt(d.toString());
4423
4424
  }
@@ -4433,7 +4434,7 @@ class Ke {
4433
4434
  }
4434
4435
  }
4435
4436
  mintAddress(t) {
4436
- return $(t) ? new c(q) : new k(t).unwrap();
4437
+ return $(t) ? new c(D) : new k(t).unwrap();
4437
4438
  }
4438
4439
  async getRegisteredTokens() {
4439
4440
  return Cr[this.network].map((t) => Be(this.chain, t));
@@ -4448,13 +4449,13 @@ class Ke {
4448
4449
  return await this.tokenBridgeRelayer.account.registeredToken.fetch(Ue(this.tokenBridgeRelayer.programId, t));
4449
4450
  }
4450
4451
  async getRedeemerConfig() {
4451
- return await this.tokenBridgeRelayer.account.redeemerConfig.fetch(qn(this.tokenBridgeRelayer.programId));
4452
+ return await this.tokenBridgeRelayer.account.redeemerConfig.fetch(Dn(this.tokenBridgeRelayer.programId));
4452
4453
  }
4453
4454
  createUnsignedTx(t, r, n = !1) {
4454
4455
  return new mt(t, this.network, this.chain, r, n);
4455
4456
  }
4456
4457
  }
4457
- gt(lt, "TokenBridge", De);
4458
+ gt(lt, "TokenBridge", qe);
4458
4459
  gt(lt, "AutomaticTokenBridge", Ke);
4459
4460
  export {
4460
4461
  pe as CreateMetadataAccountArgs,
@@ -4464,7 +4465,7 @@ export {
4464
4465
  at as Key,
4465
4466
  Le as Metadata,
4466
4467
  Ke as SolanaAutomaticTokenBridge,
4467
- De as SolanaTokenBridge,
4468
+ qe as SolanaTokenBridge,
4468
4469
  de as SplTokenMetadataProgram,
4469
4470
  vt as TOKEN_BRIDGE_IDL,
4470
4471
  kr as TOKEN_BRIDGE_RELAYER_IDL,
@@ -4476,18 +4477,18 @@ export {
4476
4477
  ot as createCompleteTransferNativeInstruction,
4477
4478
  ur as createCompleteTransferWrappedInstruction,
4478
4479
  lr as createCreateWrappedInstruction,
4479
- Fr as createInitializeInstruction,
4480
+ xr as createInitializeInstruction,
4480
4481
  W as createReadOnlyTokenBridgeProgramInterface,
4481
- xr as createRegisterChainInstruction,
4482
+ zr as createRegisterChainInstruction,
4482
4483
  ar as createTokenBridgeProgramInterface,
4483
- qe as createTokenBridgeRelayerProgramInterface,
4484
+ De as createTokenBridgeRelayerProgramInterface,
4484
4485
  ct as createTransferNativeInstruction,
4485
4486
  Tr as createTransferNativeTokensWithRelayInstruction,
4486
4487
  ut as createTransferNativeWithPayloadInstruction,
4487
4488
  wr as createTransferWrappedInstruction,
4488
4489
  br as createTransferWrappedTokensWithRelayInstruction,
4489
4490
  Sr as createTransferWrappedWithPayloadInstruction,
4490
- zr as createUpgradeContractInstruction,
4491
+ Or as createUpgradeContractInstruction,
4491
4492
  ne as deriveAuthoritySignerKey,
4492
4493
  Me as deriveCustodyKey,
4493
4494
  fe as deriveCustodySignerKey,
@@ -4495,7 +4496,7 @@ export {
4495
4496
  Ie as deriveForeignContractAddress,
4496
4497
  ke as deriveMintAuthorityKey,
4497
4498
  ze as deriveRedeemerAccountKey,
4498
- qn as deriveRedeemerConfigAddress,
4499
+ Dn as deriveRedeemerConfigAddress,
4499
4500
  Ue as deriveRegisteredTokenAddress,
4500
4501
  xe as deriveSenderAccountKey,
4501
4502
  Mt as deriveSenderConfigAddress,
@@ -4507,16 +4508,16 @@ export {
4507
4508
  re as deriveWrappedMintKey,
4508
4509
  st as getAttestTokenAccounts,
4509
4510
  cr as getCompleteTransferNativeAccounts,
4510
- Lr as getCompleteTransferNativeWithPayloadCpiAccounts,
4511
+ Dr as getCompleteTransferNativeWithPayloadCpiAccounts,
4511
4512
  dr as getCompleteTransferWrappedAccounts,
4512
4513
  qr as getCompleteTransferWrappedWithPayloadCpiAccounts,
4513
4514
  fr as getCreateWrappedAccounts,
4514
- Ur as getEndpointRegistration,
4515
+ Nr as getEndpointRegistration,
4515
4516
  mr as getInitializeAccounts,
4516
- Nr as getMetadata,
4517
+ Fr as getMetadata,
4517
4518
  gr as getRegisterChainAccounts,
4518
- Ir as getTokenBridgeConfig,
4519
- Or as getTokenBridgeDerivedAccounts,
4519
+ Ur as getTokenBridgeConfig,
4520
+ Lr as getTokenBridgeDerivedAccounts,
4520
4521
  pr as getTransferNativeAccounts,
4521
4522
  Bt as getTransferNativeWithPayloadAccounts,
4522
4523
  Ar as getTransferNativeWithPayloadCpiAccounts,
@@ -1,10 +1,10 @@
1
- import { a9 as Do, d as De, g as Pv, az as eg } from "./address-DXFbgyJW.mjs";
2
- import { t as Zy, u as tg, v as ng } from "./index-B7U-me-L.mjs";
3
- import { o as uy } from "./browser-ponyfill-Zjbs5ehD.mjs";
4
- import { e as iy, d as ag } from "./base64-DPCMLrON.mjs";
1
+ import { a9 as Do, d as De, g as Pv, az as eg } from "./address-Drr_9OcK.mjs";
2
+ import { m as Zy, o as tg, p as ng } from "./index-pNqQSm4p.mjs";
3
+ import { o as uy } from "./browser-ponyfill-oWZrCgRw.mjs";
4
+ import { e as iy, d as ag } from "./base64-BcnUThiU.mjs";
5
5
  import * as Wf from "react";
6
6
  import d1, { createContext as lg, useState as is, useEffect as Ky, useCallback as ug, useContext as ig } from "react";
7
- import { L as ot, B as mn, d as i2, a as o0, h as U2, b as og, c as w9, g as od, e as Jy, k as cd, f as wr, i as cg, j as Tr, D as vs } from "./index-pjyIirVB.mjs";
7
+ import { L as ot, B as mn, d as i2, a as o0, h as U2, b as og, c as w9, g as od, e as Jy, k as cd, f as wr, i as cg, j as Tr, D as vs } from "./index-CT2-qOL1.mjs";
8
8
  function rd(c, i) {
9
9
  (i == null || i > c.length) && (i = c.length);
10
10
  for (var d = 0, f = new Array(i); d < i; d++) f[d] = c[d];
@@ -1,11 +1,11 @@
1
1
  var v = Object.defineProperty;
2
2
  var S = (a, e, t) => e in a ? v(a, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[e] = t;
3
3
  var i = (a, e, t) => S(a, typeof e != "symbol" ? e + "" : e, t);
4
- import { aN as I, aJ as f, aL as x, $, aP as m, cv as U, aA as E, _ as w, a1 as o, c9 as k, k as c, a6 as T, d as F, aO as C, N as h } from "./address-DXFbgyJW.mjs";
5
- import { o as A, a as u, p as b, A as _, q as N } from "./index-B7U-me-L.mjs";
6
- import { A as O } from "./unsignedTransaction-BDOQhqcZ.mjs";
7
- import { A as W } from "./aptos-VwYOwtQy.mjs";
8
- import { r as Q } from "./chain-DaAd2Ztf.mjs";
4
+ import { aN as I, aJ as f, aL as x, $, aP as m, cv as U, aA as E, _ as w, a3 as o, ca as k, k as c, a6 as T, d as F, aO as C, N as h } from "./address-Drr_9OcK.mjs";
5
+ import { b as A, A as u, c as b, a as _, i as N } from "./address-Cj96wodd.mjs";
6
+ import { A as O } from "./platform-PaIJsXKV.mjs";
7
+ import { A as W } from "./unsignedTransaction-BDOQhqcZ.mjs";
8
+ import { r as Q } from "./chain-CNVMEdrk.mjs";
9
9
  const R = [
10
10
  { name: "tokenBridgeAddress", ...f },
11
11
  { name: "chain", ...x() },
@@ -34,7 +34,7 @@ class d {
34
34
  this.tokenBridgeAddress = n;
35
35
  }
36
36
  static async fromRpc(e, t) {
37
- const [s, r] = await W.chainFromRpc(e), n = t[r];
37
+ const [s, r] = await O.chainFromRpc(e), n = t[r];
38
38
  if (n.network !== s)
39
39
  throw new Error("Network mismatch " + n.network + " !== " + s);
40
40
  return new d(s, r, e, n.contracts);
@@ -199,7 +199,7 @@ class d {
199
199
  return o.encode(k(r), !0);
200
200
  }
201
201
  createUnsignedTx(e, t, s = !1) {
202
- return new O(e, this.network, this.chain, t, s);
202
+ return new W(e, this.network, this.chain, t, s);
203
203
  }
204
204
  }
205
205
  Q("Aptos", "TokenBridge", d);