@xyo-network/xl1-protocol-sdk 2.2.0 → 3.0.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 (107) hide show
  1. package/dist/neutral/ChainContextHelpers.d.ts +1 -1
  2. package/dist/neutral/ChainContextHelpers.d.ts.map +1 -1
  3. package/dist/neutral/CreatableProvider/AbstractCreatableProvider.d.ts +35 -2
  4. package/dist/neutral/CreatableProvider/AbstractCreatableProvider.d.ts.map +1 -1
  5. package/dist/neutral/CreatableProvider/ProviderFactory.d.ts.map +1 -1
  6. package/dist/neutral/CreatableProvider/ProviderFactoryLocator.d.ts.map +1 -1
  7. package/dist/neutral/amount/index.d.ts +1 -1
  8. package/dist/neutral/amount/splitOnDecimalToString.d.ts.map +1 -1
  9. package/dist/neutral/amount/{XL1Amount.d.ts → xl1Amount.d.ts} +1 -1
  10. package/dist/neutral/amount/{XL1Amount.d.ts.map → xl1Amount.d.ts.map} +1 -1
  11. package/dist/neutral/block/hydrate/hydrateBlock.d.ts.map +1 -1
  12. package/dist/neutral/block/hydrate/tryHydrateBlock.d.ts.map +1 -1
  13. package/dist/neutral/block/primitives/hashFromBlockNumber.d.ts.map +1 -1
  14. package/dist/neutral/block/primitives/validateTransactionOpcodes.d.ts.map +1 -1
  15. package/dist/neutral/capabilities/Capability.d.ts +1 -8
  16. package/dist/neutral/capabilities/Capability.d.ts.map +1 -1
  17. package/dist/neutral/capabilities/Provider.d.ts +14 -23
  18. package/dist/neutral/capabilities/Provider.d.ts.map +1 -1
  19. package/dist/neutral/capabilities/connectionTypes.d.ts +9 -0
  20. package/dist/neutral/capabilities/connectionTypes.d.ts.map +1 -0
  21. package/dist/neutral/capabilities/index.d.ts +1 -0
  22. package/dist/neutral/capabilities/index.d.ts.map +1 -1
  23. package/dist/neutral/capabilities/resolveProviders.d.ts +27 -20
  24. package/dist/neutral/capabilities/resolveProviders.d.ts.map +1 -1
  25. package/dist/neutral/config/Actor.d.ts +216 -12
  26. package/dist/neutral/config/Actor.d.ts.map +1 -1
  27. package/dist/neutral/config/Actors.d.ts +41 -2
  28. package/dist/neutral/config/Actors.d.ts.map +1 -1
  29. package/dist/neutral/config/Base.d.ts +41 -2
  30. package/dist/neutral/config/Base.d.ts.map +1 -1
  31. package/dist/neutral/config/Config.d.ts +152 -8
  32. package/dist/neutral/config/Config.d.ts.map +1 -1
  33. package/dist/neutral/config/HostActor.d.ts +216 -12
  34. package/dist/neutral/config/HostActor.d.ts.map +1 -1
  35. package/dist/neutral/config/ProviderBinding.d.ts +4 -5
  36. package/dist/neutral/config/ProviderBinding.d.ts.map +1 -1
  37. package/dist/neutral/config/adaptLegacyConfig.d.ts +2 -3
  38. package/dist/neutral/config/adaptLegacyConfig.d.ts.map +1 -1
  39. package/dist/neutral/config/connections/index.d.ts +6 -0
  40. package/dist/neutral/config/connections/index.d.ts.map +1 -0
  41. package/dist/neutral/config/index.d.ts +2 -0
  42. package/dist/neutral/config/index.d.ts.map +1 -1
  43. package/dist/neutral/config/normalizeConnectionsConfig.d.ts +20 -0
  44. package/dist/neutral/config/normalizeConnectionsConfig.d.ts.map +1 -0
  45. package/dist/neutral/config/transports/Transport.d.ts +18 -3
  46. package/dist/neutral/config/transports/Transport.d.ts.map +1 -1
  47. package/dist/neutral/context/Actor.d.ts +216 -12
  48. package/dist/neutral/context/Actor.d.ts.map +1 -1
  49. package/dist/neutral/context/HostActor.d.ts +216 -12
  50. package/dist/neutral/context/HostActor.d.ts.map +1 -1
  51. package/dist/neutral/createDeclarationPayload.d.ts.map +1 -1
  52. package/dist/neutral/createTransferPayload.d.ts.map +1 -1
  53. package/dist/neutral/getFileConfig.d.ts +70 -4
  54. package/dist/neutral/getFileConfig.d.ts.map +1 -1
  55. package/dist/neutral/getFileConfig.mjs +206 -192
  56. package/dist/neutral/getFileConfig.mjs.map +4 -4
  57. package/dist/neutral/index.mjs +953 -656
  58. package/dist/neutral/index.mjs.map +4 -4
  59. package/dist/neutral/model/CreatableProviderContext.zod.d.ts +216 -12
  60. package/dist/neutral/model/CreatableProviderContext.zod.d.ts.map +1 -1
  61. package/dist/neutral/primitives/chain/step/chainStepRewardAddress.d.ts.map +1 -1
  62. package/dist/neutral/primitives/chain/step/stepRewardTotal.d.ts.map +1 -1
  63. package/dist/neutral/primitives/chain/time/{externalBlockNumberFromXL1BlockNumber.d.ts → externalBlockNumberFromXl1BlockNumber.d.ts} +1 -1
  64. package/dist/neutral/primitives/chain/time/{externalBlockNumberFromXL1BlockNumber.d.ts.map → externalBlockNumberFromXl1BlockNumber.d.ts.map} +1 -1
  65. package/dist/neutral/primitives/chain/time/{externalBlockRangeFromXL1BlockRange.d.ts → externalBlockRangeFromXl1BlockRange.d.ts} +1 -1
  66. package/dist/neutral/primitives/chain/time/{externalBlockRangeFromXL1BlockRange.d.ts.map → externalBlockRangeFromXl1BlockRange.d.ts.map} +1 -1
  67. package/dist/neutral/primitives/chain/time/index.d.ts +2 -2
  68. package/dist/neutral/primitives/datalake/PayloadLocator.d.ts.map +1 -1
  69. package/dist/neutral/primitives/datalake/addDataLakePayloadsToPayloads.d.ts.map +1 -1
  70. package/dist/neutral/primitives/readPayloadMapFromStore.d.ts.map +1 -1
  71. package/dist/neutral/primitives/stake/activeStakeAtTimeByAddress.d.ts.map +1 -1
  72. package/dist/neutral/primitives/stake/activeStakeAtTimeByPosition.d.ts.map +1 -1
  73. package/dist/neutral/primitives/stake/weightedStakeForRangeByPosition.d.ts.map +1 -1
  74. package/dist/neutral/primitives/state/findMostRecentBlock.d.ts.map +1 -1
  75. package/dist/neutral/primitives/uncle/findUncles.d.ts.map +1 -1
  76. package/dist/neutral/simple/accountBalance/SimpleAccountBalanceViewer.d.ts +3 -6
  77. package/dist/neutral/simple/accountBalance/SimpleAccountBalanceViewer.d.ts.map +1 -1
  78. package/dist/neutral/simple/block/SimpleBlockViewer.d.ts.map +1 -1
  79. package/dist/neutral/simple/blockInvalidation/SimpleBlockInvalidationViewer.d.ts.map +1 -1
  80. package/dist/neutral/simple/blockValidation/SimpleBlockValidationViewer.d.ts.map +1 -1
  81. package/dist/neutral/simple/datalake/AbstractRestDataLake.d.ts.map +1 -1
  82. package/dist/neutral/simple/datalake/RestDataLakeRunner.d.ts.map +1 -1
  83. package/dist/neutral/simple/datalake/SimpleDataLakeRunner.d.ts.map +1 -1
  84. package/dist/neutral/simple/finalization/SimpleFinalizationRunner.d.ts.map +1 -1
  85. package/dist/neutral/simple/finalization/SimpleFinalizationViewer.d.ts.map +1 -1
  86. package/dist/neutral/simple/gateway/SimpleXyoGatewayRunner.d.ts.map +1 -1
  87. package/dist/neutral/simple/mempool/SimpleMempoolRunner.d.ts +1 -1
  88. package/dist/neutral/simple/mempool/SimpleMempoolRunner.d.ts.map +1 -1
  89. package/dist/neutral/simple/mempool/SimpleMempoolViewer.d.ts +2 -0
  90. package/dist/neutral/simple/mempool/SimpleMempoolViewer.d.ts.map +1 -1
  91. package/dist/neutral/simple/network/SimpleXyoNetwork.d.ts.map +1 -1
  92. package/dist/neutral/simple/timeSync2/SimpleTimeSyncViewer.d.ts.map +1 -1
  93. package/dist/neutral/simple/transactionInvalidation/SimpleTransactionInvalidationViewer.d.ts.map +1 -1
  94. package/dist/neutral/simple/transactionValidation/SimpleTransactionValidationViewer.d.ts.map +1 -1
  95. package/dist/neutral/summary/primitives/balances/balancesStepSummaryFromRange.d.ts.map +1 -1
  96. package/dist/neutral/test/buildBlock.d.ts.map +1 -1
  97. package/dist/neutral/test/buildRandomChain.d.ts.map +1 -1
  98. package/dist/neutral/test/buildRandomGenesisBlock.d.ts.map +1 -1
  99. package/dist/neutral/test/buildRandomTransaction.d.ts.map +1 -1
  100. package/dist/neutral/test/createProducerChainStakeIntentTransaction.d.ts.map +1 -1
  101. package/dist/neutral/test/index.mjs +344 -279
  102. package/dist/neutral/test/index.mjs.map +4 -4
  103. package/dist/neutral/transaction/buildTransaction.d.ts.map +1 -1
  104. package/dist/neutral/transaction/buildUnsignedTransaction.d.ts.map +1 -1
  105. package/dist/neutral/transaction/confirmSubmittedTransaction.d.ts.map +1 -1
  106. package/dist/neutral/transaction/hydrateTransaction.d.ts.map +1 -1
  107. package/package.json +8 -8
package/dist/neutral/transaction/buildTransaction.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../../../src/transaction/buildTransaction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,eAAe,EAAE,OAAO,EAAE,UAAU,EACrC,MAAM,qBAAqB,CAAA;AAI5B,OAAO,KAAK,EACV,mBAAmB,EACnB,OAAO,EAGP,qCAAqC,EACmB,qBAAqB,EAC7E,cAAc,EACf,MAAM,+BAA+B,CAAA;AAGtC,qCAAqC;AACrC,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,OAAO,EACd,eAAe,EAAE,mBAAmB,EAAE,EACtC,gBAAgB,EAAE,OAAO,EAAE,EAC3B,MAAM,EAAE,eAAe,GAAG,eAAe,EAAE,EAC3C,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,cAAc,EACnB,IAAI,CAAC,EAAE,UAAU,EACjB,IAAI,GAAE,qBAA8C,GACnD,OAAO,CAAC,qCAAqC,CAAC,CAwChD"}
1
+ {"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../../../src/transaction/buildTransaction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,eAAe,EAAE,OAAO,EAAE,UAAU,EACrC,MAAM,qBAAqB,CAAA;AAI5B,OAAO,KAAK,EACV,mBAAmB,EACnB,OAAO,EAGP,qCAAqC,EACmB,qBAAqB,EAC7E,cAAc,EACf,MAAM,+BAA+B,CAAA;AAGtC,qCAAqC;AACrC,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,OAAO,EACd,eAAe,EAAE,mBAAmB,EAAE,EACtC,gBAAgB,EAAE,OAAO,EAAE,EAC3B,MAAM,EAAE,eAAe,GAAG,eAAe,EAAE,EAC3C,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,cAAc,EACnB,IAAI,CAAC,EAAE,UAAU,EACjB,IAAI,GAAE,qBAA8C,GACnD,OAAO,CAAC,qCAAqC,CAAC,CAsChD"}
package/dist/neutral/transaction/buildUnsignedTransaction.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"buildUnsignedTransaction.d.ts","sourceRoot":"","sources":["../../../src/transaction/buildUnsignedTransaction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAE9D,OAAO,KAAK,EACV,mBAAmB,EAAE,OAAO,EAAwF,qBAAqB,EACzI,2BAA2B,EAC3B,cAAc,EACf,MAAM,+BAA+B,CAAA;AAGtC,6CAA6C;AAC7C,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,OAAO,EACd,eAAe,EAAE,mBAAmB,EAAE,EACtC,gBAAgB,EAAE,OAAO,EAAE,EAC3B,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,cAAc,EACnB,IAAI,EAAE,UAAU,EAChB,IAAI,GAAE,qBAA8C,GACnD,OAAO,CAAC,2BAA2B,CAAC,CAmCtC"}
1
+ {"version":3,"file":"buildUnsignedTransaction.d.ts","sourceRoot":"","sources":["../../../src/transaction/buildUnsignedTransaction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAE9D,OAAO,KAAK,EACV,mBAAmB,EAAE,OAAO,EAAwF,qBAAqB,EACzI,2BAA2B,EAC3B,cAAc,EACf,MAAM,+BAA+B,CAAA;AAGtC,6CAA6C;AAC7C,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,OAAO,EACd,eAAe,EAAE,mBAAmB,EAAE,EACtC,gBAAgB,EAAE,OAAO,EAAE,EAC3B,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,cAAc,EACnB,IAAI,EAAE,UAAU,EAChB,IAAI,GAAE,qBAA8C,GACnD,OAAO,CAAC,2BAA2B,CAAC,CAiCtC"}
package/dist/neutral/transaction/confirmSubmittedTransaction.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"confirmSubmittedTransaction.d.ts","sourceRoot":"","sources":["../../../src/transaction/confirmSubmittedTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAI1C,OAAO,KAAK,EACV,kCAAkC,EAAE,yBAAyB,EAC7D,SAAS,EACV,MAAM,+BAA+B,CAAA;AAsBtC;;;;;;GAMG;AACH,eAAO,MAAM,2BAA2B,GACtC,QAAQ,SAAS,EACjB,QAAQ,IAAI,EACZ,UAAU,kCAAkC,KAC3C,OAAO,CAAC,yBAAyB,CAyBnC,CAAA"}
1
+ {"version":3,"file":"confirmSubmittedTransaction.d.ts","sourceRoot":"","sources":["../../../src/transaction/confirmSubmittedTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAI1C,OAAO,KAAK,EACV,kCAAkC,EAAE,yBAAyB,EAC7D,SAAS,EACV,MAAM,+BAA+B,CAAA;AAsBtC;;;;;;GAMG;AACH,eAAO,MAAM,2BAA2B,GACtC,QAAQ,SAAS,EACjB,QAAQ,IAAI,EACZ,UAAU,kCAAkC,KAC3C,OAAO,CAAC,yBAAyB,CAuBnC,CAAA"}
package/dist/neutral/transaction/hydrateTransaction.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"hydrateTransaction.d.ts","sourceRoot":"","sources":["../../../src/transaction/hydrateTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAE1C,OAAO,KAAK,EAAE,OAAO,EAAmB,MAAM,qBAAqB,CAAA;AAInE,OAAO,KAAK,EACW,mBAAmB,EAAE,yBAAyB,EACnE,qCAAqC,EACrC,wCAAwC,EACzC,MAAM,+BAA+B,CAAA;AAKtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAEvD,sCAAsC;AACtC,eAAO,MAAM,qBAAqB,GAChC,cAAc,cAAc,EAC5B,MAAM,IAAI,KACT,OAAO,CAAC,wCAAwC,GAAG,SAAS,CAa9D,CAAA;AAED,mCAAmC;AACnC,eAAO,MAAM,kBAAkB,GAC7B,cAAc,cAAc,EAC5B,MAAM,IAAI,KACT,OAAO,CAAC,yBAAyB,CAanC,CAAA;AAED,kDAAkD;AAClD,wBAAgB,0BAA0B,CAAC,CAAC,SAAS,mBAAmB,EAAE,mBAAmB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAGzH;AAED,gDAAgD;AAChD,eAAO,MAAM,+BAA+B,GAC1C,WAAW,OAAO,EAAE,KACnB,yBAAyB,GAAG,SAQ9B,CAAA;AAED,6CAA6C;AAC7C,eAAO,MAAM,4BAA4B,GAAI,WAAW,OAAO,EAAE,KAAG,yBACW,CAAA;AAE/E,mDAAmD;AACnD,wBAAgB,2BAA2B,CAAC,CAAC,SAAS,mBAAmB,EAAE,oBAAoB,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAE7H;AAED,8CAA8C;AAC9C,eAAO,MAAM,6BAA6B,GACxC,cAAc,cAAc,EAC5B,MAAM,IAAI,KACT,OAAO,CAAC,qCAAqC,GAAG,SAAS,CAqB3D,CAAA;AAED,2CAA2C;AAC3C,eAAO,MAAM,0BAA0B,GACrC,SAAS,cAAc,EACvB,MAAM,IAAI,KACT,OAAO,CAAC,qCAAqC,CAE/C,CAAA"}
1
+ {"version":3,"file":"hydrateTransaction.d.ts","sourceRoot":"","sources":["../../../src/transaction/hydrateTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAE1C,OAAO,KAAK,EAAE,OAAO,EAAmB,MAAM,qBAAqB,CAAA;AAInE,OAAO,KAAK,EACW,mBAAmB,EAAE,yBAAyB,EACnE,qCAAqC,EACrC,wCAAwC,EACzC,MAAM,+BAA+B,CAAA;AAKtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAEvD,sCAAsC;AACtC,eAAO,MAAM,qBAAqB,GAChC,cAAc,cAAc,EAC5B,MAAM,IAAI,KACT,OAAO,CAAC,wCAAwC,GAAG,SAAS,CAW9D,CAAA;AAED,mCAAmC;AACnC,eAAO,MAAM,kBAAkB,GAC7B,cAAc,cAAc,EAC5B,MAAM,IAAI,KACT,OAAO,CAAC,yBAAyB,CAWnC,CAAA;AAED,kDAAkD;AAClD,wBAAgB,0BAA0B,CAAC,CAAC,SAAS,mBAAmB,EAAE,mBAAmB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAGzH;AAED,gDAAgD;AAChD,eAAO,MAAM,+BAA+B,GAC1C,WAAW,OAAO,EAAE,KACnB,yBAAyB,GAAG,SAQ9B,CAAA;AAED,6CAA6C;AAC7C,eAAO,MAAM,4BAA4B,GAAI,WAAW,OAAO,EAAE,KAAG,yBACW,CAAA;AAE/E,mDAAmD;AACnD,wBAAgB,2BAA2B,CAAC,CAAC,SAAS,mBAAmB,EAAE,oBAAoB,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAE7H;AAED,8CAA8C;AAC9C,eAAO,MAAM,6BAA6B,GACxC,cAAc,cAAc,EAC5B,MAAM,IAAI,KACT,OAAO,CAAC,qCAAqC,GAAG,SAAS,CAqB3D,CAAA;AAED,2CAA2C;AAC3C,eAAO,MAAM,0BAA0B,GACrC,SAAS,cAAc,EACvB,MAAM,IAAI,KACT,OAAO,CAAC,qCAAqC,CAE/C,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@xyo-network/xl1-protocol-sdk",
3
- "version": "2.2.0",
3
+ "version": "3.0.0",
4
4
  "description": "XYO Layer One SDK Protocol",
5
5
  "homepage": "https://xylabs.com",
6
6
  "bugs": {
@@ -42,10 +42,10 @@
42
42
  "README.md"
43
43
  ],
44
44
  "dependencies": {
45
- "@xyo-network/xl1-driver-memory": "~2.2.0",
46
- "@xyo-network/xl1-protocol-model": "~2.2.0",
47
- "@xyo-network/xl1-protocol-lib": "~2.2.0",
48
- "@xyo-network/xl1-schema": "~2.2.0"
45
+ "@xyo-network/xl1-driver-memory": "~3.0.0",
46
+ "@xyo-network/xl1-protocol-lib": "~3.0.0",
47
+ "@xyo-network/xl1-protocol-model": "~3.0.0",
48
+ "@xyo-network/xl1-schema": "~3.0.0"
49
49
  },
50
50
  "devDependencies": {
51
51
  "@bitauth/libauth": "~3.0.0",
@@ -58,8 +58,8 @@
58
58
  "@xylabs/geo": "^6.1.3",
59
59
  "@xylabs/sdk-js": "^6.1.3",
60
60
  "@xylabs/threads": "^6.1.3",
61
- "@xylabs/toolchain": "~8.1.21",
62
- "@xylabs/tsconfig": "~8.1.21",
61
+ "@xylabs/toolchain": "~8.2.5",
62
+ "@xylabs/tsconfig": "~8.2.5",
63
63
  "@xylabs/vitest-extended": "^6.1.3",
64
64
  "@xyo-network/sdk-js": "^6.1.0",
65
65
  "@xyo-network/sdk-protocol-js": "~6.1.1",
@@ -79,7 +79,7 @@
79
79
  "vitest": "~4.1.9",
80
80
  "webextension-polyfill": "^0.12.0",
81
81
  "zod": "~4.4.3",
82
- "@xyo-network/xl1-network-model": "~2.2.0"
82
+ "@xyo-network/xl1-network-model": "~3.0.0"
83
83
  },
84
84
  "peerDependencies": {
85
85
  "@bitauth/libauth": "~3.0",