@wormhole-foundation/wormhole-connect 2.1.0-beta.2-development → 2.1.0-beta.4-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 (128) hide show
  1. package/README.md +1 -0
  2. package/dist/main.js +105 -105
  3. package/dist/src/config/constants.d.ts.map +1 -1
  4. package/dist/src/config/mainnet/chains.d.ts.map +1 -1
  5. package/dist/src/config/mainnet/rpcs.d.ts.map +1 -1
  6. package/dist/src/config/mainnet/tokens.d.ts.map +1 -1
  7. package/dist/src/config/tokens.d.ts +1 -1
  8. package/dist/src/config/tokens.d.ts.map +1 -1
  9. package/dist/src/config/types.d.ts +1 -1
  10. package/dist/src/config/types.d.ts.map +1 -1
  11. package/dist/src/hooks/useTransactionHistoryMayan.d.ts.map +1 -1
  12. package/dist/src/hooks/useTransactionHistoryWHScan.d.ts.map +1 -1
  13. package/dist/src/icons/ChainIcons.d.ts.map +1 -1
  14. package/dist/src/icons/Chains/BERA.d.ts +4 -0
  15. package/dist/src/icons/Chains/BERA.d.ts.map +1 -0
  16. package/dist/src/icons/Tokens/BERA.d.ts +4 -0
  17. package/dist/src/icons/Tokens/BERA.d.ts.map +1 -0
  18. package/dist/src/sdklegacy/config/MAINNET.d.ts.map +1 -1
  19. package/dist/src/store/transferInput.d.ts +1 -1
  20. package/dist/src/store/transferInput.d.ts.map +1 -1
  21. package/dist/src/utils/coingecko.d.ts.map +1 -1
  22. package/dist/src/views/v2/Bridge/ReviewTransaction/index.d.ts.map +1 -1
  23. package/dist/src/views/v2/Bridge/Routes/SingleRoute.d.ts +1 -2
  24. package/dist/src/views/v2/Bridge/Routes/SingleRoute.d.ts.map +1 -1
  25. package/dist/src/views/v2/Bridge/Routes/index.d.ts.map +1 -1
  26. package/lib/{aptos-Ckopfy7I.mjs → aptos-7bfFeMdP.mjs} +5 -5
  27. package/lib/{aptos-CYxRBLR_.js → aptos-CE1z5RIR.js} +1 -1
  28. package/lib/{aptos-7G9wZkGW.js → aptos-otpuaKYt.js} +2 -2
  29. package/lib/{aptos-BlOWGpyT.mjs → aptos-zuWdA6my.mjs} +2 -2
  30. package/lib/{base64-HSuzVIKw.mjs → base64-k-Os5ldO.mjs} +1 -1
  31. package/lib/{base64-CFR5QWTY.js → base64-kjIpMcmW.js} +1 -1
  32. package/lib/{ccip-CVUhxB0q.js → ccip-BWC0vPMX.js} +1 -1
  33. package/lib/{ccip-Bntg_vPp.mjs → ccip-Bap8XFZB.mjs} +1 -1
  34. package/lib/{chunk-IMTC3J2M-BADDWO3l.mjs → chunk-IMTC3J2M-BXX6zaqr.mjs} +3 -3
  35. package/lib/{chunk-IMTC3J2M-ByR5Yjf4.js → chunk-IMTC3J2M-CpYue-QB.js} +1 -1
  36. package/lib/{events-lD3LhLH0.mjs → events-BYQcWm6S.mjs} +1 -1
  37. package/lib/{events-jATx_JnD.js → events-CpvDCRB6.js} +1 -1
  38. package/lib/{evm-BW0CHBCG.mjs → evm-BqioDqJQ.mjs} +5 -5
  39. package/lib/{evm-z5yFHxM9.js → evm-CnzdN7DL.js} +3 -3
  40. package/lib/{evm-Bh1Y4eUx.js → evm-D_gq6Vkl.js} +1 -1
  41. package/lib/{evm-ColKfWEz.mjs → evm-Mwom3m1b.mjs} +5 -5
  42. package/lib/{index-CCUy1jes.js → index-B887bVqe.js} +1 -1
  43. package/lib/{index-BhexWYVn.js → index-B9GJ0P2Y.js} +1 -1
  44. package/lib/{index-DUXnbpVg.js → index-BDfVMafv.js} +1 -1
  45. package/lib/{index-Cl6LSKsg.mjs → index-BGh4lL9A.mjs} +1 -1
  46. package/lib/{index-C6WDEDwO.js → index-BGk8Lib3.js} +1 -1
  47. package/lib/{index-oPxOJfPK.mjs → index-BNmhIn8v.mjs} +2 -2
  48. package/lib/{index-C-OIv0gT.js → index-BNu2XU7B.js} +1 -1
  49. package/lib/{index-2fBRXVP8.mjs → index-BWUeb28M.mjs} +2 -2
  50. package/lib/{index-D0XcjaUl.mjs → index-B_z7jrcA.mjs} +2 -2
  51. package/lib/{index-lHA40g0z.mjs → index-Bb7Z_dn3.mjs} +2 -2
  52. package/lib/{index-DOXMkFA4.js → index-BrLmYS1g.js} +1 -1
  53. package/lib/{index-CfnNi3Zd.mjs → index-C2xA6weJ.mjs} +3 -3
  54. package/lib/{index-8JCep4IW.js → index-C5Z4SKFb.js} +1 -1
  55. package/lib/{index-CcFpkXPM.mjs → index-C8kUlYxX.mjs} +2 -2
  56. package/lib/{index-DleO04Ea.js → index-C8uhXGvb.js} +1 -1
  57. package/lib/{index-DB_r424l.mjs → index-CLjMuc-R.mjs} +1 -1
  58. package/lib/{index-DIAuhm70.mjs → index-CNrMl-ka.mjs} +5 -5
  59. package/lib/{index-l0NqjNj9.js → index-CPZPv8ma.js} +1 -1
  60. package/lib/{index-D7IcLxQc.js → index-CQ-vXwWG.js} +1 -1
  61. package/lib/{index-BcdbCktu.js → index-CWeUuvwd.js} +1 -1
  62. package/lib/{index-CAUvtNGE.mjs → index-CgLcGLhQ.mjs} +3 -3
  63. package/lib/{index-InC6In6o.mjs → index-Ck2lgHfH.mjs} +2 -2
  64. package/lib/{index-DGgQSMuG.js → index-CpquIcpv.js} +1 -1
  65. package/lib/{index-rFhS51F6.js → index-CsvfK_04.js} +1 -1
  66. package/lib/{index-lEBTHIqm.mjs → index-D4D9pisy.mjs} +2 -2
  67. package/lib/{index-BXkdaYu_.mjs → index-D5xdeVYW.mjs} +1 -1
  68. package/lib/{index-B9GU1bLs.mjs → index-DLMhM2Ah.mjs} +1 -1
  69. package/lib/{index-Cxw9PIcl.js → index-DUMDc9-8.js} +1 -1
  70. package/lib/{index-CYBM2IeY.mjs → index-DXxwhxlz.mjs} +26490 -25668
  71. package/lib/{index-y_DeeCWD.mjs → index-DYSyjZam.mjs} +4 -4
  72. package/lib/{index-V7kxzAZX.js → index-Dn17pEx3.js} +1 -1
  73. package/lib/{index-CxQ-swIQ.mjs → index-Dv_PN2YS.mjs} +1 -1
  74. package/lib/{index-gd_dleYk.mjs → index-DvaQAdrQ.mjs} +1 -1
  75. package/lib/{index-8-70GvMi.js → index-H9KqFgmp.js} +1 -1
  76. package/lib/{index-DQVQrflZ.js → index-LRbQsraN.js} +1 -1
  77. package/lib/{index-DECw2aR6.mjs → index-SpRjE-lR.mjs} +1 -1
  78. package/lib/{index-DZvLy2Dr.js → index-WOTkpZNS.js} +139 -139
  79. package/lib/{index-WLqZ1uO7.js → index-Y446HRy8.js} +1 -1
  80. package/lib/{index-DjkMeATf.js → index-iQUhiTbf.js} +1 -1
  81. package/lib/{index-DAzDpd7U.js → index-is9vbRk6.js} +1 -1
  82. package/lib/{index-BZ0W_BZS.mjs → index-nmuj3_P0.mjs} +2 -2
  83. package/lib/{index-CBxgME-2.mjs → index-qKiBJqxf.mjs} +2 -2
  84. package/lib/{index.es-Doowrf9a.js → index.es-DaKST-Tu.js} +2 -2
  85. package/lib/{index.es-YqKQxHG6.mjs → index.es-XELuGQ1v.mjs} +6 -6
  86. package/lib/index.js +1 -1
  87. package/lib/index.mjs +1 -1
  88. package/lib/{signer-eoVHaZz7.js → signer-C8BdcDph.js} +1 -1
  89. package/lib/{signer-CfU9wW3f.mjs → signer-CBkcr0G7.mjs} +1 -1
  90. package/lib/solana-B4bIzZfk.js +1 -0
  91. package/lib/{solana-y-l38J4U.mjs → solana-BT0u9BIk.mjs} +5 -5
  92. package/lib/{solana-CHUnEnef.mjs → solana-DZJoFr_V.mjs} +4 -4
  93. package/lib/{solana-C_d_AKET.js → solana-Dp3nxJ5I.js} +1 -1
  94. package/lib/{solanaEmbed.esm-B4tNQ7S7.js → solanaEmbed.esm-Dmb33sr2.js} +1 -1
  95. package/lib/{solanaEmbed.esm-DVOHg5WI.mjs → solanaEmbed.esm-DyCdC9Bf.mjs} +2 -2
  96. package/lib/src/config/constants.d.ts.map +1 -1
  97. package/lib/src/config/mainnet/chains.d.ts.map +1 -1
  98. package/lib/src/config/mainnet/rpcs.d.ts.map +1 -1
  99. package/lib/src/config/mainnet/tokens.d.ts.map +1 -1
  100. package/lib/src/config/tokens.d.ts +1 -1
  101. package/lib/src/config/tokens.d.ts.map +1 -1
  102. package/lib/src/config/types.d.ts +1 -1
  103. package/lib/src/config/types.d.ts.map +1 -1
  104. package/lib/src/hooks/useTransactionHistoryMayan.d.ts.map +1 -1
  105. package/lib/src/hooks/useTransactionHistoryWHScan.d.ts.map +1 -1
  106. package/lib/src/icons/ChainIcons.d.ts.map +1 -1
  107. package/lib/src/icons/Chains/BERA.d.ts +4 -0
  108. package/lib/src/icons/Chains/BERA.d.ts.map +1 -0
  109. package/lib/src/icons/Tokens/BERA.d.ts +4 -0
  110. package/lib/src/icons/Tokens/BERA.d.ts.map +1 -0
  111. package/lib/src/sdklegacy/config/MAINNET.d.ts.map +1 -1
  112. package/lib/src/store/transferInput.d.ts +1 -1
  113. package/lib/src/store/transferInput.d.ts.map +1 -1
  114. package/lib/src/utils/coingecko.d.ts.map +1 -1
  115. package/lib/src/views/v2/Bridge/ReviewTransaction/index.d.ts.map +1 -1
  116. package/lib/src/views/v2/Bridge/Routes/SingleRoute.d.ts +1 -2
  117. package/lib/src/views/v2/Bridge/Routes/SingleRoute.d.ts.map +1 -1
  118. package/lib/src/views/v2/Bridge/Routes/index.d.ts.map +1 -1
  119. package/lib/{sui-1fbLRIUL.mjs → sui-B8eP92oc.mjs} +5 -5
  120. package/lib/{sui-BN1m6APK.js → sui-CGplq_XL.js} +1 -1
  121. package/lib/{sui-D9frS9ki.mjs → sui-Dn893IB9.mjs} +1 -1
  122. package/lib/{sui-K20aVxqE.js → sui-K4_elpRl.js} +2 -2
  123. package/package.json +18 -18
  124. package/dist/src/config/routes.d.ts +0 -10
  125. package/dist/src/config/routes.d.ts.map +0 -1
  126. package/lib/solana-SFHXHGL2.js +0 -1
  127. package/lib/src/config/routes.d.ts +0 -10
  128. package/lib/src/config/routes.d.ts.map +0 -1
@@ -1,5 +1,5 @@
1
- import { b as vo, d as _o, f as xo, g as Eo, i as Fo, j as Ao, k as So, l as Bo, m as Io, n as Oo, c as To } from "./index-CxQ-swIQ.mjs";
2
- import { V as ge, X as Tn, cr as Co, aB as me } from "./index-CYBM2IeY.mjs";
1
+ import { b as vo, d as _o, f as xo, g as Eo, i as Fo, j as Ao, k as So, l as Bo, m as Io, n as Oo, c as To } from "./index-Dv_PN2YS.mjs";
2
+ import { V as ge, X as Tn, cr as Co, aB as me } from "./index-DXxwhxlz.mjs";
3
3
  function Cn(e = 0) {
4
4
  return globalThis.Buffer != null && globalThis.Buffer.allocUnsafe != null ? globalThis.Buffer.allocUnsafe(e) : new Uint8Array(e);
5
5
  }
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-DZvLy2Dr.js");class o extends Error{constructor(r){super(r)}}class s extends o{constructor(){super(...arguments),this.name="TokenOwnerOffCurveError"}}const n=e.struct([e.u32("mintAuthorityOption"),e.publicKey("mintAuthority"),e.u64("supply"),e.u8("decimals"),e.bool("isInitialized"),e.u32("freezeAuthorityOption"),e.publicKey("freezeAuthority")]);n.span;async function c(t,r,u=!1,i=e.TOKEN_PROGRAM_ID,O=e.ASSOCIATED_TOKEN_PROGRAM_ID){if(!u&&!e.PublicKey.isOnCurve(r.toBuffer()))throw new s;const[A]=await e.PublicKey.findProgramAddress([r.toBuffer(),i.toBuffer(),t.toBuffer()],O);return A}exports.ASSOCIATED_TOKEN_PROGRAM_ID=e.ASSOCIATED_TOKEN_PROGRAM_ID;exports.TOKEN_2022_PROGRAM_ID=e.TOKEN_2022_PROGRAM_ID;exports.TOKEN_PROGRAM_ID=e.TOKEN_PROGRAM_ID;exports.MintLayout=n;exports.TokenError=o;exports.TokenOwnerOffCurveError=s;exports.getAssociatedTokenAddress=c;
1
+ "use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-WOTkpZNS.js");class o extends Error{constructor(r){super(r)}}class s extends o{constructor(){super(...arguments),this.name="TokenOwnerOffCurveError"}}const n=e.struct([e.u32("mintAuthorityOption"),e.publicKey("mintAuthority"),e.u64("supply"),e.u8("decimals"),e.bool("isInitialized"),e.u32("freezeAuthorityOption"),e.publicKey("freezeAuthority")]);n.span;async function c(t,r,u=!1,i=e.TOKEN_PROGRAM_ID,O=e.ASSOCIATED_TOKEN_PROGRAM_ID){if(!u&&!e.PublicKey.isOnCurve(r.toBuffer()))throw new s;const[A]=await e.PublicKey.findProgramAddress([r.toBuffer(),i.toBuffer(),t.toBuffer()],O);return A}exports.ASSOCIATED_TOKEN_PROGRAM_ID=e.ASSOCIATED_TOKEN_PROGRAM_ID;exports.TOKEN_2022_PROGRAM_ID=e.TOKEN_2022_PROGRAM_ID;exports.TOKEN_PROGRAM_ID=e.TOKEN_PROGRAM_ID;exports.MintLayout=n;exports.TokenError=o;exports.TokenOwnerOffCurveError=s;exports.getAssociatedTokenAddress=c;
@@ -1,9 +1,9 @@
1
1
  var S = Object.defineProperty;
2
2
  var b = (a, e, t) => e in a ? S(a, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[e] = t;
3
3
  var i = (a, e, t) => b(a, typeof e != "symbol" ? e + "" : e, t);
4
- import { cd as v, ce as f, cf as I, c9 as x, cg as A, b6 as w, bA as U, bd as $, bB as m, r as o, aC as k, p as c, m as h, ch as C, bG as T, V as E, bD as F, k as _, be as u, ci as W, bj as N } from "./index-CYBM2IeY.mjs";
4
+ import { cd as v, ce as f, cf as I, c9 as x, cg as A, b6 as w, bA as U, bd as $, bB as m, r as o, aC as k, p as c, m as h, ch as C, bG as T, V as E, bD as F, k as _, be as u, ci as W, bj as N } from "./index-DXxwhxlz.mjs";
5
5
  import { A as O } from "./unsignedTransaction-BDOQhqcZ.mjs";
6
- import { A as Q } from "./aptos-Ckopfy7I.mjs";
6
+ import { A as Q } from "./aptos-7bfFeMdP.mjs";
7
7
  const R = [
8
8
  { name: "tokenBridgeAddress", ...f },
9
9
  { name: "chain", ...I() },
@@ -1,8 +1,8 @@
1
1
  var d = Object.defineProperty;
2
2
  var h = (a, e, t) => e in a ? d(a, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[e] = t;
3
3
  var o = (a, e, t) => h(a, typeof e != "symbol" ? e + "" : e, t);
4
- import { b6 as m, bB as w, cc as g, r as p, bj as u } from "./index-CYBM2IeY.mjs";
5
- import { A as l } from "./aptos-Ckopfy7I.mjs";
4
+ import { b6 as m, bB as w, cc as g, r as p, bj as u } from "./index-DXxwhxlz.mjs";
5
+ import { A as l } from "./aptos-7bfFeMdP.mjs";
6
6
  class i {
7
7
  constructor(e, t, r, s) {
8
8
  o(this, "network");
@@ -1,8 +1,8 @@
1
1
  var d = Object.defineProperty;
2
2
  var h = (i, e, r) => e in i ? d(i, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : i[e] = r;
3
3
  var o = (i, e, r) => h(i, typeof e != "symbol" ? e + "" : e, r);
4
- import { b6 as m, cc as w, K as g, bj as p } from "./index-CYBM2IeY.mjs";
5
- import { S as u } from "./sui-1fbLRIUL.mjs";
4
+ import { b6 as m, cc as w, K as g, bj as p } from "./index-DXxwhxlz.mjs";
5
+ import { S as u } from "./sui-B8eP92oc.mjs";
6
6
  class c {
7
7
  constructor(e, r, t, n) {
8
8
  o(this, "network");
@@ -1 +1 @@
1
- "use strict";const e=require("./index-DZvLy2Dr.js");function I(n,t,o,s){e.ahash(n);const a=e.checkOpts({dkLen:32,asyncTick:10},s),{c:d,dkLen:i,asyncTick:r}=a;if(e.anumber(d),e.anumber(i),e.anumber(r),d<1)throw new Error("PBKDF2: iterations (c) should be >= 1");const l=e.toBytes(t),u=e.toBytes(o),f=new Uint8Array(i),p=e.hmac.create(n,l),c=p._cloneInto().update(u);return{c:d,dkLen:i,asyncTick:r,DK:f,PRF:p,PRFSalt:c}}function L(n,t,o,s,a){return n.destroy(),t.destroy(),s&&s.destroy(),a.fill(0),o}function g(n,t,o,s){const{c:a,dkLen:d,DK:i,PRF:r,PRFSalt:l}=I(n,t,o,s);let u;const f=new Uint8Array(4),p=e.createView(f),c=new Uint8Array(r.outputLen);for(let w=1,y=0;y<d;w++,y+=r.outputLen){const m=i.subarray(y,y+r.outputLen);p.setInt32(0,w,!1),(u=l._cloneInto(u)).update(f).digestInto(c),m.set(c.subarray(0,m.length));for(let h=1;h<a;h++){r._cloneInto(u).update(c).digestInto(c);for(let k=0;k<m.length;k++)m[k]^=c[k]}}return L(r,l,i,u,c)}/*! scure-bip39 - MIT License (c) 2022 Patricio Palladino, Paul Miller (paulmillr.com) */function b(n){if(typeof n!="string")throw new TypeError("invalid mnemonic type: "+typeof n);return n.normalize("NFKD")}function F(n){const t=b(n),o=t.split(" ");if(![12,15,18,21,24].includes(o.length))throw new Error("Invalid mnemonic");return{nfkd:t,words:o}}const S=n=>b("mnemonic"+n);function T(n,t=""){return g(e.sha512,F(n).nfkd,S(t),{c:2048,dkLen:64})}exports.mnemonicToSeedSync=T;
1
+ "use strict";const e=require("./index-WOTkpZNS.js");function I(n,t,o,s){e.ahash(n);const a=e.checkOpts({dkLen:32,asyncTick:10},s),{c:d,dkLen:i,asyncTick:r}=a;if(e.anumber(d),e.anumber(i),e.anumber(r),d<1)throw new Error("PBKDF2: iterations (c) should be >= 1");const l=e.toBytes(t),u=e.toBytes(o),f=new Uint8Array(i),p=e.hmac.create(n,l),c=p._cloneInto().update(u);return{c:d,dkLen:i,asyncTick:r,DK:f,PRF:p,PRFSalt:c}}function L(n,t,o,s,a){return n.destroy(),t.destroy(),s&&s.destroy(),a.fill(0),o}function g(n,t,o,s){const{c:a,dkLen:d,DK:i,PRF:r,PRFSalt:l}=I(n,t,o,s);let u;const f=new Uint8Array(4),p=e.createView(f),c=new Uint8Array(r.outputLen);for(let w=1,y=0;y<d;w++,y+=r.outputLen){const m=i.subarray(y,y+r.outputLen);p.setInt32(0,w,!1),(u=l._cloneInto(u)).update(f).digestInto(c),m.set(c.subarray(0,m.length));for(let h=1;h<a;h++){r._cloneInto(u).update(c).digestInto(c);for(let k=0;k<m.length;k++)m[k]^=c[k]}}return L(r,l,i,u,c)}/*! scure-bip39 - MIT License (c) 2022 Patricio Palladino, Paul Miller (paulmillr.com) */function b(n){if(typeof n!="string")throw new TypeError("invalid mnemonic type: "+typeof n);return n.normalize("NFKD")}function F(n){const t=b(n),o=t.split(" ");if(![12,15,18,21,24].includes(o.length))throw new Error("Invalid mnemonic");return{nfkd:t,words:o}}const S=n=>b("mnemonic"+n);function T(n,t=""){return g(e.sha512,F(n).nfkd,S(t),{c:2048,dkLen:64})}exports.mnemonicToSeedSync=T;
@@ -1,9 +1,9 @@
1
1
  var Zr = Object.defineProperty;
2
2
  var Yr = (t, e, r) => e in t ? Zr(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
3
3
  var M = (t, e, r) => Yr(t, typeof e != "symbol" ? e + "" : e, r);
4
- import { X as Qr, y as en, ck as ft, I as tn, cl as hr, cm as ke, b8 as rn, bA as nt, bB as nr, bd as nn, b6 as ce, K as ge, m as oe, ba as sn, bG as ir, bD as an, cn as on, be as ht, H as cn, r as De, c9 as un, bR as sr, co as dn, J as ar, bj as gr } from "./index-CYBM2IeY.mjs";
5
- import { g as tt, a as gt, i as Ve, S as Q, b as H, p as ln, c as fn, d as it, u as ze, e as pr, f as hn, h as He, j as gn, k as pn } from "./sui-1fbLRIUL.mjs";
6
- import "./index-lHA40g0z.mjs";
4
+ import { X as Qr, y as en, ck as ft, I as tn, cl as hr, cm as ke, b8 as rn, bA as nt, bB as nr, bd as nn, b6 as ce, K as ge, m as oe, ba as sn, bG as ir, bD as an, cn as on, be as ht, H as cn, r as De, c9 as un, bR as sr, co as dn, J as ar, bj as gr } from "./index-DXxwhxlz.mjs";
5
+ import { g as tt, a as gt, i as Ve, S as Q, b as H, p as ln, c as fn, d as it, u as ze, e as pr, f as hn, h as He, j as gn, k as pn } from "./sui-B8eP92oc.mjs";
6
+ import "./index-Bb7Z_dn3.mjs";
7
7
  import { S as yr } from "./unsignedTransaction-BD81leu1.mjs";
8
8
  class yn extends TypeError {
9
9
  constructor(e, r) {