@thalalabs/surf 0.0.15 → 1.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 (94) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/README.md +44 -45
  3. package/build/cjs/core/Client.js +55 -41
  4. package/build/cjs/core/Client.js.map +1 -1
  5. package/build/cjs/core/WalletClient.js +20 -31
  6. package/build/cjs/core/WalletClient.js.map +1 -1
  7. package/build/cjs/core/createEntryPayload.js +9 -91
  8. package/build/cjs/core/createEntryPayload.js.map +1 -1
  9. package/build/cjs/core/createViewPayload.js +26 -52
  10. package/build/cjs/core/createViewPayload.js.map +1 -1
  11. package/build/cjs/core/index.js +2 -2
  12. package/build/cjs/core/index.js.map +1 -1
  13. package/build/cjs/ensureTypes.js.map +1 -1
  14. package/build/cjs/hooks/index.js.map +1 -1
  15. package/build/cjs/hooks/useSubmitTransaction.js +25 -46
  16. package/build/cjs/hooks/useSubmitTransaction.js.map +1 -1
  17. package/build/cjs/hooks/useWalletClient.js +2 -2
  18. package/build/cjs/hooks/useWalletClient.js.map +1 -1
  19. package/build/cjs/index.js +2 -2
  20. package/build/cjs/index.js.map +1 -1
  21. package/build/esm/core/Client.js +53 -39
  22. package/build/esm/core/Client.js.map +1 -1
  23. package/build/esm/core/WalletClient.js +20 -31
  24. package/build/esm/core/WalletClient.js.map +1 -1
  25. package/build/esm/core/createEntryPayload.js +9 -91
  26. package/build/esm/core/createEntryPayload.js.map +1 -1
  27. package/build/esm/core/createViewPayload.js +26 -52
  28. package/build/esm/core/createViewPayload.js.map +1 -1
  29. package/build/esm/core/index.js +1 -1
  30. package/build/esm/core/index.js.map +1 -1
  31. package/build/esm/ensureTypes.js.map +1 -1
  32. package/build/esm/hooks/index.js.map +1 -1
  33. package/build/esm/hooks/useSubmitTransaction.js +25 -46
  34. package/build/esm/hooks/useSubmitTransaction.js.map +1 -1
  35. package/build/esm/hooks/useWalletClient.js +2 -2
  36. package/build/esm/hooks/useWalletClient.js.map +1 -1
  37. package/build/esm/index.js +1 -1
  38. package/build/esm/index.js.map +1 -1
  39. package/build/types/core/Client.d.ts +61 -48
  40. package/build/types/core/Client.d.ts.map +1 -1
  41. package/build/types/core/WalletClient.d.ts +3 -5
  42. package/build/types/core/WalletClient.d.ts.map +1 -1
  43. package/build/types/core/createEntryPayload.d.ts +8 -8
  44. package/build/types/core/createEntryPayload.d.ts.map +1 -1
  45. package/build/types/core/createViewPayload.d.ts +4 -4
  46. package/build/types/core/createViewPayload.d.ts.map +1 -1
  47. package/build/types/core/index.d.ts +1 -1
  48. package/build/types/core/index.d.ts.map +1 -1
  49. package/build/types/ensureTypes.d.ts.map +1 -1
  50. package/build/types/hooks/index.d.ts +1 -1
  51. package/build/types/hooks/index.d.ts.map +1 -1
  52. package/build/types/hooks/useSubmitTransaction.d.ts +3 -11
  53. package/build/types/hooks/useSubmitTransaction.d.ts.map +1 -1
  54. package/build/types/hooks/useWalletClient.d.ts +1 -3
  55. package/build/types/hooks/useWalletClient.d.ts.map +1 -1
  56. package/build/types/index.d.ts +2 -2
  57. package/build/types/index.d.ts.map +1 -1
  58. package/build/types/types/abi.d.ts.map +1 -1
  59. package/build/types/types/client/abiClient.d.ts +12 -16
  60. package/build/types/types/client/abiClient.d.ts.map +1 -1
  61. package/build/types/types/client/client.d.ts +11 -23
  62. package/build/types/types/client/client.d.ts.map +1 -1
  63. package/build/types/types/convertor/argsConvertor.d.ts +1 -1
  64. package/build/types/types/convertor/argsConvertor.d.ts.map +1 -1
  65. package/build/types/types/convertor/genericConvertor.d.ts.map +1 -1
  66. package/build/types/types/convertor/returnConvertor.d.ts +1 -1
  67. package/build/types/types/index.d.ts +2 -1
  68. package/build/types/types/index.d.ts.map +1 -1
  69. package/package.json +10 -11
  70. package/src/core/Client.ts +110 -114
  71. package/src/core/WalletClient.ts +21 -31
  72. package/src/core/__tests__/accountResource.test.ts +56 -54
  73. package/src/core/__tests__/createEntryPayload.test.ts +34 -34
  74. package/src/core/__tests__/createViewPayload.test.ts +94 -111
  75. package/src/core/__tests__/option.test.ts +38 -31
  76. package/src/core/__tests__/submitTransaction.test.ts +58 -26
  77. package/src/core/__tests__/useABI.test.ts +38 -38
  78. package/src/core/__tests__/view.test.ts +36 -30
  79. package/src/core/__tests__/view_vector.test.ts +52 -50
  80. package/src/core/createEntryPayload.ts +24 -143
  81. package/src/core/createViewPayload.ts +40 -68
  82. package/src/core/index.ts +1 -1
  83. package/src/ensureTypes.ts +1 -0
  84. package/src/hooks/index.ts +0 -1
  85. package/src/hooks/useSubmitTransaction.ts +35 -68
  86. package/src/hooks/useWalletClient.ts +2 -2
  87. package/src/index.ts +2 -1
  88. package/src/types/abi.ts +1 -0
  89. package/src/types/client/abiClient.ts +12 -16
  90. package/src/types/client/client.ts +11 -25
  91. package/src/types/convertor/argsConvertor.ts +1 -1
  92. package/src/types/convertor/genericConvertor.ts +2 -0
  93. package/src/types/convertor/returnConvertor.ts +3 -3
  94. package/src/types/index.ts +3 -2
@@ -1,20 +1,19 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.createViewPayload = void 0;
4
- const aptos_1 = require("aptos");
5
4
  const ensureTypes_js_1 = require("../ensureTypes.js");
6
5
  function createViewPayload(abi, payload) {
7
6
  const fnAbi = abi.exposed_functions.filter((f) => f.name === payload.function)[0];
8
- const type_arguments = payload.type_arguments;
9
- const val_arguments = payload.arguments;
7
+ const type_arguments = payload.typeArguments;
8
+ const val_arguments = payload.functionArguments;
10
9
  if (fnAbi === undefined)
11
10
  throw new Error(`Function ${payload.function} not found in ABI`);
12
11
  if (fnAbi.params.length !== val_arguments.length)
13
- throw new Error(`Function ${payload.function} expects ${fnAbi.params.length} arguments, but ${payload.arguments.length} were provided`);
12
+ throw new Error(`Function ${payload.function} expects ${fnAbi.params.length} arguments, but ${payload.functionArguments.length} were provided`);
14
13
  if (fnAbi.generic_type_params.length !== type_arguments.length)
15
- throw new Error(`Function ${payload.function} expects ${fnAbi.generic_type_params.length} type arguments, but ${payload.type_arguments.length} were provided`);
14
+ throw new Error(`Function ${payload.function} expects ${fnAbi.generic_type_params.length} type arguments, but ${payload.functionArguments.length} were provided`);
16
15
  const args = fnAbi.params.map((type, i) => {
17
- const arg = payload.arguments[i];
16
+ const arg = payload.functionArguments[i];
18
17
  if (['u8', 'u16', 'u32'].includes(type)) {
19
18
  return (0, ensureTypes_js_1.ensureNumber)(arg);
20
19
  }
@@ -31,65 +30,30 @@ function createViewPayload(abi, payload) {
31
30
  return arg;
32
31
  }
33
32
  });
34
- const decoders = fnAbi.return.map((type) => {
35
- if (['u64', 'u128', 'u256'].includes(type)) {
36
- return decodeBigint;
37
- }
38
- else if (type.includes('vector')) {
39
- return (value) => decodeVector(type, value);
40
- }
41
- else {
42
- return null;
43
- }
44
- });
45
33
  return {
46
- viewRequest: {
47
- function: `${abi.address}::${abi.name}::${payload.function}`,
48
- arguments: args,
49
- type_arguments: payload.type_arguments,
50
- },
51
- decoders,
34
+ function: `${abi.address}::${abi.name}::${payload.function}`,
35
+ functionArguments: args,
36
+ typeArguments: payload.typeArguments,
52
37
  };
53
38
  }
54
39
  exports.createViewPayload = createViewPayload;
55
- function decodeBigint(value) {
56
- return BigInt(value);
57
- }
58
- function decodeVector(type, value) {
40
+ function encodeVector(type, value) {
59
41
  const regex = /vector<([^]+)>/;
60
42
  const match = type.match(regex);
61
43
  if (!match) {
62
44
  throw new Error(`Unsupported type: ${type}`);
63
45
  }
64
46
  const innerType = match[1];
65
- if (['address', 'bool', 'u8', 'u16', 'u32'].includes(innerType)) {
66
- return value;
67
- }
68
- else if (['u64', 'u128', 'u256'].includes(innerType)) {
69
- return value.map((v) => BigInt(v));
70
- }
71
- else {
72
- return value;
73
- }
74
- }
75
- function encodeVector(type, value) {
76
- const regex = /vector<([^]+)>/;
77
- const match = type.match(regex);
78
- if (!match) {
47
+ if (!innerType) {
79
48
  throw new Error(`Unsupported type: ${type}`);
80
49
  }
81
- const innerType = match[1];
82
50
  if (innerType === 'u8') {
83
- return aptos_1.HexString.fromUint8Array(typeof value === 'string' ?
84
- new TextEncoder().encode(value) :
85
- value instanceof Uint8Array ?
86
- value :
87
- new Uint8Array(value.map((v) => {
88
- const result = (0, ensureTypes_js_1.ensureNumber)(v);
89
- if (result < 0 || result > 255)
90
- throw new Error(`Invalid u8 value: ${result}`);
91
- return result;
92
- }))).hexString;
51
+ if (typeof value === 'string' || value instanceof Uint8Array)
52
+ return value;
53
+ if (Array.isArray(value)) {
54
+ return arrayToHex(value);
55
+ }
56
+ throw new Error(`Invalid u8 value: ${value}`);
93
57
  }
94
58
  else if (['bool', 'u16', 'u32'].includes(innerType)) {
95
59
  return value;
@@ -101,4 +65,14 @@ function encodeVector(type, value) {
101
65
  return value;
102
66
  }
103
67
  }
68
+ const arrayToHex = (array) => {
69
+ let result = "0x";
70
+ array.forEach((item) => {
71
+ const n = (0, ensureTypes_js_1.ensureNumber)(item);
72
+ if (n < 0 || n > 255)
73
+ throw new Error(`Invalid u8 value: ${n}`);
74
+ result += n.toString(16).padStart(2, '0');
75
+ });
76
+ return result;
77
+ };
104
78
  //# sourceMappingURL=createViewPayload.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"createViewPayload.js","sourceRoot":"","sources":["../../../src/core/createViewPayload.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"createViewPayload.js","sourceRoot":"","sources":["../../../src/core/createViewPayload.ts"],"names":[],"mappings":";;;AAOA,sDAAiD;AAmBjD,SAAgB,iBAAiB,CAI/B,GAAM,EACN,OAAyC;IAEzC,MAAM,KAAK,GAAG,GAAG,CAAC,iBAAiB,CAAC,MAAM,CACxC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,QAAQ,CACnC,CAAC,CAAC,CAAC,CAAC;IACL,MAAM,cAAc,GAAa,OAAO,CAAC,aAAa,CAAC;IAEvD,MAAM,aAAa,GAAU,OAAO,CAAC,iBAAiB,CAAC;IAGvD,IAAI,KAAK,KAAK,SAAS;QACrB,MAAM,IAAI,KAAK,CAAC,YAAY,OAAO,CAAC,QAAQ,mBAAmB,CAAC,CAAC;IACnE,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,aAAa,CAAC,MAAM;QAC9C,MAAM,IAAI,KAAK,CACb,YAAY,OAAO,CAAC,QAAQ,YAAY,KAAK,CAAC,MAAM,CAAC,MAAM,mBAAmB,OAAO,CAAC,iBAAiB,CAAC,MAAM,gBAAgB,CAC/H,CAAC;IACJ,IAAI,KAAK,CAAC,mBAAmB,CAAC,MAAM,KAAK,cAAc,CAAC,MAAM;QAC5D,MAAM,IAAI,KAAK,CACb,YAAY,OAAO,CAAC,QAAQ,YAAY,KAAK,CAAC,mBAAmB,CAAC,MAAM,wBAAwB,OAAO,CAAC,iBAAiB,CAAC,MAAM,gBAAgB,CACjJ,CAAC;IAGJ,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;QACxC,MAAM,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAY,CAAC;QACpD,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YACvC,OAAO,IAAA,6BAAY,EAAC,GAAa,CAAC,CAAC;SACpC;aAAM,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YACjD,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE;gBAClB,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,EAAE,CAAC,CAAC;aACvD;YACD,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;SACvB;aAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YAElC,OAAO,YAAY,CAAC,IAAI,EAAE,GAAY,CAAC,CAAC;SACzC;aAAM;YAEL,OAAO,GAAG,CAAC;SACZ;IACH,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ,EAAE,GAAG,GAAG,CAAC,OAAO,KAAK,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,QAAQ,EAAE;QAC5D,iBAAiB,EAAE,IAAI;QACvB,aAAa,EAAE,OAAO,CAAC,aAAoC;KAC5D,CAAC;AACJ,CAAC;AAlDD,8CAkDC;AAGD,SAAS,YAAY,CAAC,IAAY,EAAE,KAAU;IAC5C,MAAM,KAAK,GAAG,gBAAgB,CAAC;IAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAChC,IAAI,CAAC,KAAK,EAAE;QAEV,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC;KAC9C;IACD,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3B,IAAG,CAAC,SAAS,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC;KAC9C;IAED,IAAI,SAAS,KAAK,IAAI,EAAE;QACtB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,UAAU;YAC1D,OAAO,KAAK,CAAC;QACf,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAA;SACzB;QAED,MAAM,IAAI,KAAK,CAAC,qBAAqB,KAAK,EAAE,CAAC,CAAA;KAE9C;SAAM,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QACrD,OAAO,KAAK,CAAC;KACd;SAAM,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QACtD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;KAC/C;SAAM;QAGL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,MAAM,UAAU,GAAG,CAAC,KAA0B,EAAU,EAAE;IACxD,IAAI,MAAM,GAAG,IAAI,CAAC;IAClB,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,MAAM,CAAC,GAAG,IAAA,6BAAY,EAAC,IAAI,CAAC,CAAC;QAC7B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG;YAClB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;QAC5C,MAAM,IAAI,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
@@ -1,9 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.createEntryPayload = exports.createViewPayload = exports.createClient = exports.MoveTsClient = void 0;
3
+ exports.createEntryPayload = exports.createViewPayload = exports.createSurfClient = exports.MoveTsClient = void 0;
4
4
  var Client_js_1 = require("./Client.js");
5
5
  Object.defineProperty(exports, "MoveTsClient", { enumerable: true, get: function () { return Client_js_1.Client; } });
6
- Object.defineProperty(exports, "createClient", { enumerable: true, get: function () { return Client_js_1.createClient; } });
6
+ Object.defineProperty(exports, "createSurfClient", { enumerable: true, get: function () { return Client_js_1.createSurfClient; } });
7
7
  var createViewPayload_js_1 = require("./createViewPayload.js");
8
8
  Object.defineProperty(exports, "createViewPayload", { enumerable: true, get: function () { return createViewPayload_js_1.createViewPayload; } });
9
9
  var createEntryPayload_js_1 = require("./createEntryPayload.js");
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/index.ts"],"names":[],"mappings":";;;AAAA,yCAAmE;AAA1D,yGAAA,MAAM,OAAgB;AAAE,yGAAA,YAAY,OAAA;AAC7C,+DAA2D;AAAlD,yHAAA,iBAAiB,OAAA;AAC1B,iEAA6D;AAApD,2HAAA,kBAAkB,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/index.ts"],"names":[],"mappings":";;;AAAA,yCAAuE;AAA9D,yGAAA,MAAM,OAAgB;AAAE,6GAAA,gBAAgB,OAAA;AACjD,+DAA2D;AAAlD,yHAAA,iBAAiB,OAAA;AAC1B,iEAA6D;AAApD,2HAAA,kBAAkB,OAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"ensureTypes.js","sourceRoot":"","sources":["../../src/ensureTypes.ts"],"names":[],"mappings":";;;AAAA,SAAS,UAAU,CAAC,GAAQ,EAAE,KAAwB,EAAE,OAAgB;IACtE,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,OAAO,GAAG,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CACb,OAAO;YACL,gBAAgB,GAAG,mBACjB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAChD,EAAE,CACL,CAAC;KACH;AACH,CAAC;AAED,SAAgB,aAAa,CAAC,GAAqB;IACjD,UAAU,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IACvC,IAAI,OAAO,GAAG,KAAK,SAAS,EAAE;QAC5B,OAAO,GAAG,CAAC;KACZ;IAED,IAAI,GAAG,KAAK,MAAM,EAAE;QAClB,OAAO,IAAI,CAAC;KACb;IACD,IAAI,GAAG,KAAK,OAAO,EAAE;QACnB,OAAO,KAAK,CAAC;KACd;IAED,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;AAC7C,CAAC;AAdD,sCAcC;AAED,SAAgB,YAAY,CAAC,GAAoB;IAC/C,UAAU,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;IACtC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAC3B,OAAO,GAAG,CAAC;KACZ;IAED,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACrC,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;KAC3C;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAZD,oCAYC;AAED,SAAgB,YAAY,CAAC,GAA6B;IACxD,UAAU,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;IAChD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;AACrB,CAAC;AAHD,oCAGC"}
1
+ {"version":3,"file":"ensureTypes.js","sourceRoot":"","sources":["../../src/ensureTypes.ts"],"names":[],"mappings":";;;AACA,SAAS,UAAU,CAAC,GAAQ,EAAE,KAAwB,EAAE,OAAgB;IACtE,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,OAAO,GAAG,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CACb,OAAO;YACL,gBAAgB,GAAG,mBACjB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAChD,EAAE,CACL,CAAC;KACH;AACH,CAAC;AAED,SAAgB,aAAa,CAAC,GAAqB;IACjD,UAAU,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IACvC,IAAI,OAAO,GAAG,KAAK,SAAS,EAAE;QAC5B,OAAO,GAAG,CAAC;KACZ;IAED,IAAI,GAAG,KAAK,MAAM,EAAE;QAClB,OAAO,IAAI,CAAC;KACb;IACD,IAAI,GAAG,KAAK,OAAO,EAAE;QACnB,OAAO,KAAK,CAAC;KACd;IAED,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;AAC7C,CAAC;AAdD,sCAcC;AAED,SAAgB,YAAY,CAAC,GAAoB;IAC/C,UAAU,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;IACtC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAC3B,OAAO,GAAG,CAAC;KACZ;IAED,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACrC,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;KAC3C;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAZD,oCAYC;AAED,SAAgB,YAAY,CAAC,GAA6B;IACxD,UAAU,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;IAChD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;AACrB,CAAC;AAHD,oCAGC"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":";;;AAAA,qEAGmC;AADjC,+HAAA,oBAAoB,OAAA;AAEtB,2DAAuD;AAA9C,qHAAA,eAAe,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":";;;AAAA,qEAEmC;AADjC,+HAAA,oBAAoB,OAAA;AAEtB,2DAAuD;AAA9C,qHAAA,eAAe,OAAA"}
@@ -3,12 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.useSubmitTransaction = void 0;
4
4
  const react_1 = require("react");
5
5
  const wallet_adapter_react_1 = require("@aptos-labs/wallet-adapter-react");
6
- const aptos_1 = require("aptos");
7
- function isRawPayload(payload) {
8
- return payload.rawPayload !== undefined;
9
- }
10
6
  const useSubmitTransaction = () => {
11
- const { signAndSubmitTransaction } = (0, wallet_adapter_react_1.useWallet)();
7
+ const { connected, signAndSubmitTransaction, account } = (0, wallet_adapter_react_1.useWallet)();
12
8
  const [isIdle, setIsIdle] = (0, react_1.useState)(true);
13
9
  const [isLoading, setIsLoading] = (0, react_1.useState)(false);
14
10
  const [data, setResult] = (0, react_1.useState)();
@@ -21,7 +17,10 @@ const useSubmitTransaction = () => {
21
17
  setError(undefined);
22
18
  idRef.current = idRef.current + 1;
23
19
  }
24
- async function submitTransaction(payload, { nodeUrl, onSuccess, onFailed, max_gas_amount }) {
20
+ async function submitTransaction(payload, options) {
21
+ if (connected === false) {
22
+ throw new Error('Wallet is not connected');
23
+ }
25
24
  if (signAndSubmitTransaction === undefined) {
26
25
  return;
27
26
  }
@@ -31,58 +30,38 @@ const useSubmitTransaction = () => {
31
30
  }
32
31
  setIsLoading(true);
33
32
  setIsIdle(false);
34
- const request = isRawPayload(payload) ? payload.rawPayload : payload;
33
+ let result;
35
34
  try {
36
- const { hash } = await signAndSubmitTransaction({
37
- type: 'entry_function_payload',
38
- ...request,
39
- arguments: request.arguments.map((arg) => {
40
- if (Array.isArray(arg)) {
41
- return arg.map((item) => item.toString());
42
- }
43
- else if (typeof arg === 'object') {
44
- throw new Error(`a value of struct type: ${arg} is not supported`);
45
- }
46
- else {
47
- return arg.toString();
48
- }
49
- }),
50
- }, { max_gas_amount });
51
- const client = new aptos_1.AptosClient(nodeUrl);
52
- const result = (await client.waitForTransactionWithResult(hash, {
53
- checkSuccess: true,
54
- }));
55
- if (id === idRef.current) {
56
- try {
57
- onSuccess?.(result);
58
- }
59
- catch (e) {
60
- console.error(e);
35
+ result = await signAndSubmitTransaction({
36
+ sender: account?.address ?? "",
37
+ data: {
38
+ ...payload,
39
+ functionArguments: payload.functionArguments.map((arg) => {
40
+ if (Array.isArray(arg)) {
41
+ return arg.map((item) => item.toString());
42
+ }
43
+ else if (typeof arg === 'object') {
44
+ throw new Error(`a value of struct type: ${arg} is not supported`);
45
+ }
46
+ else {
47
+ return arg.toString();
48
+ }
49
+ }),
61
50
  }
51
+ }, options);
52
+ if (id === idRef.current) {
62
53
  setResult(result);
63
54
  }
64
55
  }
65
56
  catch (e) {
66
- if (id === idRef.current) {
67
- const error = e instanceof Error
68
- ? e
69
- : e
70
- ? new Error(String(e))
71
- : new Error('unknown error');
72
- try {
73
- onFailed?.(error);
74
- }
75
- catch (e2) {
76
- console.error(e2);
77
- }
78
- setError(error);
79
- }
57
+ setError(error);
80
58
  }
81
59
  finally {
82
60
  if (id === idRef.current) {
83
61
  setIsLoading(false);
84
62
  }
85
63
  }
64
+ return result;
86
65
  }
87
66
  return { submitTransaction, reset, isLoading, isIdle, data, error };
88
67
  };
@@ -1 +1 @@
1
- {"version":3,"file":"useSubmitTransaction.js","sourceRoot":"","sources":["../../../src/hooks/useSubmitTransaction.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useSubmitTransaction.js","sourceRoot":"","sources":["../../../src/hooks/useSubmitTransaction.ts"],"names":[],"mappings":";;;AAAA,iCAAyC;AACzC,2EAA6D;AAKtD,MAAM,oBAAoB,GAAG,GAAG,EAAE;IACvC,MAAM,EAAE,SAAS,EAAE,wBAAwB,EAAE,OAAO,EAAE,GAAG,IAAA,gCAAS,GAAE,CAAC;IAErE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,EAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAElD,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,GAAO,CAAC;IAC1C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAC;IAC5C,MAAM,KAAK,GAAG,IAAA,cAAM,EAAS,CAAC,CAAC,CAAC;IAEhC,SAAS,KAAK;QACZ,SAAS,CAAC,IAAI,CAAC,CAAC;QAChB,YAAY,CAAC,KAAK,CAAC,CAAC;QACpB,SAAS,CAAC,SAAS,CAAC,CAAC;QACrB,QAAQ,CAAC,SAAS,CAAC,CAAC;QACpB,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,UAAU,iBAAiB,CAC9B,OAAqB,EACrB,OAAyC;QAIzC,IAAI,SAAS,KAAK,KAAK,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QAED,IAAI,wBAAwB,KAAK,SAAS,EAAE;YAC1C,OAAO;SACR;QACD,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC;QAEzB,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACvD;QACD,YAAY,CAAC,IAAI,CAAC,CAAC;QACnB,SAAS,CAAC,KAAK,CAAC,CAAC;QAEjB,IAAI,MAAM,CAAA;QACV,IAAI;YACF,MAAM,GAAG,MAAM,wBAAwB,CACrC;gBACE,MAAM,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE;gBAC9B,IAAI,EAAE;oBACJ,GAAG,OAAO;oBAEV,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAQ,EAAE,EAAE;wBAC5D,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;4BAEtB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;yBAChD;6BAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;4BAClC,MAAM,IAAI,KAAK,CACb,2BAA2B,GAAG,mBAAmB,CAClD,CAAC;yBACH;6BAAM;4BACL,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;yBACvB;oBACH,CAAC,CAAC;iBACH;aACF,EACD,OAAO,CACR,CAAC;YAGF,IAAI,EAAE,KAAK,KAAK,CAAC,OAAO,EAAE;gBACxB,SAAS,CAAC,MAAM,CAAC,CAAC;aACnB;SACF;QAAC,OAAO,CAAC,EAAE;YACV,QAAQ,CAAC,KAAK,CAAC,CAAC;SACjB;gBAAS;YAER,IAAI,EAAE,KAAK,KAAK,CAAC,OAAO,EAAE;gBACxB,YAAY,CAAC,KAAK,CAAC,CAAC;aACrB;SACF;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AACtE,CAAC,CAAC;AAjFW,QAAA,oBAAoB,wBAiF/B"}
@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.useWalletClient = void 0;
4
4
  const wallet_adapter_react_1 = require("@aptos-labs/wallet-adapter-react");
5
5
  const WalletClient_js_1 = require("../core/WalletClient.js");
6
- const useWalletClient = ({ nodeUrl }) => {
6
+ const useWalletClient = () => {
7
7
  const wallet = (0, wallet_adapter_react_1.useWallet)();
8
8
  return {
9
9
  connected: wallet.connected,
10
10
  client: wallet.connected
11
- ? new WalletClient_js_1.WalletClient({ wallet, nodeUrl })
11
+ ? new WalletClient_js_1.WalletClient({ wallet, })
12
12
  : undefined,
13
13
  };
14
14
  };
@@ -1 +1 @@
1
- {"version":3,"file":"useWalletClient.js","sourceRoot":"","sources":["../../../src/hooks/useWalletClient.ts"],"names":[],"mappings":";;;AAAA,2EAA6D;AAC7D,6DAAuD;AAEhD,MAAM,eAAe,GAAG,CAAC,EAAE,OAAO,EAAuB,EAAE,EAAE;IAClE,MAAM,MAAM,GAAG,IAAA,gCAAS,GAAE,CAAC;IAC3B,OAAO;QACL,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,MAAM,EAAE,MAAM,CAAC,SAAS;YACtB,CAAC,CAAC,IAAI,8BAAY,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;YACvC,CAAC,CAAC,SAAS;KACd,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,eAAe,mBAQ1B"}
1
+ {"version":3,"file":"useWalletClient.js","sourceRoot":"","sources":["../../../src/hooks/useWalletClient.ts"],"names":[],"mappings":";;;AAAA,2EAA6D;AAC7D,6DAAuD;AAEhD,MAAM,eAAe,GAAG,GAAG,EAAE;IAClC,MAAM,MAAM,GAAG,IAAA,gCAAS,GAAE,CAAC;IAC3B,OAAO;QACL,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,MAAM,EAAE,MAAM,CAAC,SAAS;YACtB,CAAC,CAAC,IAAI,8BAAY,CAAC,EAAE,MAAM,GAAG,CAAC;YAC/B,CAAC,CAAC,SAAS;KACd,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,eAAe,mBAQ1B"}
@@ -1,8 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.createClient = exports.createEntryPayload = exports.createViewPayload = void 0;
3
+ exports.createSurfClient = exports.createEntryPayload = exports.createViewPayload = void 0;
4
4
  var index_js_1 = require("./core/index.js");
5
5
  Object.defineProperty(exports, "createViewPayload", { enumerable: true, get: function () { return index_js_1.createViewPayload; } });
6
6
  Object.defineProperty(exports, "createEntryPayload", { enumerable: true, get: function () { return index_js_1.createEntryPayload; } });
7
- Object.defineProperty(exports, "createClient", { enumerable: true, get: function () { return index_js_1.createClient; } });
7
+ Object.defineProperty(exports, "createSurfClient", { enumerable: true, get: function () { return index_js_1.createSurfClient; } });
8
8
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,4CAIyB;AAHvB,6GAAA,iBAAiB,OAAA;AACjB,8GAAA,kBAAkB,OAAA;AAClB,wGAAA,YAAY,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,4CAIyB;AAHvB,6GAAA,iBAAiB,OAAA;AACjB,8GAAA,kBAAkB,OAAA;AAClB,4GAAA,gBAAgB,OAAA"}
@@ -1,8 +1,7 @@
1
- import { AptosClient, TxnBuilderTypes } from 'aptos';
2
1
  import { createViewPayload } from './createViewPayload.js';
3
2
  import { createEntryPayload } from './createEntryPayload.js';
4
- export function createClient(options) {
5
- return new Client(new AptosClient(options.nodeUrl));
3
+ export function createSurfClient(aptosClient) {
4
+ return new Client(aptosClient);
6
5
  }
7
6
  export class Client {
8
7
  constructor(client) {
@@ -14,27 +13,32 @@ export class Client {
14
13
  });
15
14
  this.client = client;
16
15
  }
17
- async view(payload, options) {
18
- const result = await this.client.view(payload.viewRequest, options?.ledger_version);
19
- return result.map((value, i) => payload.decoders[i] ? payload.decoders[i](value) : value);
16
+ async view(args) {
17
+ return await this.client.view(args);
20
18
  }
21
- async submitTransaction(payload, options) {
22
- const rawTxn = await this.generateRawTxn(payload, options);
23
- const bcsTxn = AptosClient.generateBCSTransaction(options.account, rawTxn);
24
- const transactionRes = await this.client.submitSignedBCSTransaction(bcsTxn);
25
- await this.client.waitForTransaction(transactionRes.hash, {
26
- timeoutSecs: 120,
27
- checkSuccess: true,
19
+ async submitTransaction(args) {
20
+ const transaction = await this.client.build.transaction({
21
+ sender: args.signer.accountAddress.toString(),
22
+ data: args.payload,
23
+ });
24
+ const transactionRes = await this.client.signAndSubmitTransaction({
25
+ signer: args.signer,
26
+ transaction,
27
+ });
28
+ return await this.client.waitForTransaction({
29
+ transactionHash: transactionRes.hash,
30
+ options: args.options ?? {},
28
31
  });
29
- return transactionRes;
30
32
  }
31
- async simulateTransaction(payload, options) {
32
- const rawTxn = await this.generateRawTxn(payload, options);
33
- const transactionRes = (await this.client.simulateTransaction(options.account, rawTxn))[0];
34
- if (!transactionRes) {
35
- throw new Error('Failed to simulate transaction');
36
- }
37
- return transactionRes;
33
+ async simulateTransaction(args) {
34
+ const transaction = await this.client.build.transaction({
35
+ sender: args.sender,
36
+ data: args.payload,
37
+ });
38
+ return (await this.client.simulate.transaction({
39
+ signerPublicKey: args.publicKey,
40
+ transaction,
41
+ }))[0];
38
42
  }
39
43
  useABI(abi) {
40
44
  return {
@@ -44,11 +48,14 @@ export class Client {
44
48
  return (...args) => {
45
49
  const payload = createViewPayload(abi, {
46
50
  function: functionName,
47
- type_arguments: args[0].type_arguments,
48
- arguments: args[0].arguments,
51
+ typeArguments: args[0].typeArguments,
52
+ functionArguments: args[0].functionArguments,
49
53
  });
50
- return this.view(payload, {
51
- ledger_version: args[0].ledger_version,
54
+ return this.view({
55
+ payload,
56
+ options: {
57
+ ledgerVersion: args[0].ledgerVersion,
58
+ }
52
59
  });
53
60
  };
54
61
  },
@@ -59,12 +66,20 @@ export class Client {
59
66
  return (...args) => {
60
67
  const payload = createEntryPayload(abi, {
61
68
  function: functionName,
62
- type_arguments: args[0].type_arguments,
63
- arguments: args[0].arguments,
69
+ typeArguments: args[0].typeArguments,
70
+ functionArguments: args[0].functionArguments,
64
71
  });
72
+ const account = args[0].account;
65
73
  return args[0].isSimulation
66
- ? this.simulateTransaction(payload, { account: args[0].account })
67
- : this.submitTransaction(payload, { account: args[0].account });
74
+ ? this.simulateTransaction({
75
+ publicKey: account.publicKey,
76
+ sender: account.accountAddress.toString(),
77
+ payload,
78
+ })
79
+ : this.submitTransaction({
80
+ signer: args[0].account,
81
+ payload,
82
+ });
68
83
  };
69
84
  },
70
85
  }),
@@ -72,22 +87,21 @@ export class Client {
72
87
  get: (_, prop) => {
73
88
  let structName = prop.toString();
74
89
  return (...args) => {
75
- if (args[0].type_arguments.length !== 0) {
76
- structName += `<${args[0].type_arguments.join(',')}>`;
90
+ if (args[0].typeArguments.length !== 0) {
91
+ structName += `<${args[0].typeArguments.join(',')}>`;
77
92
  }
78
- return this.client.getAccountResource(args[0].account, `${abi.address}::${abi.name}::${structName}`, {
79
- ledgerVersion: args[0].ledger_version,
93
+ const account = args[0].account;
94
+ return this.client.getAccountResource({
95
+ accountAddress: account,
96
+ resourceType: `${abi.address}::${abi.name}::${structName}`,
97
+ options: {
98
+ ledgerVersion: args[0].ledgerVersion,
99
+ }
80
100
  });
81
101
  };
82
102
  },
83
103
  }),
84
104
  };
85
105
  }
86
- async generateRawTxn(payload, options) {
87
- const { account } = options;
88
- const entryFunctionPayload = new TxnBuilderTypes.TransactionPayloadEntryFunction(payload.entryRequest);
89
- const rawTxn = await this.client.generateRawTransaction(account.address(), entryFunctionPayload);
90
- return rawTxn;
91
- }
92
106
  }
93
107
  //# sourceMappingURL=Client.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Client.js","sourceRoot":"","sources":["../../../src/core/Client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Client.js","sourceRoot":"","sources":["../../../src/core/Client.ts"],"names":[],"mappings":"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"}
@@ -1,43 +1,32 @@
1
- import { AptosClient } from 'aptos';
2
1
  import { createEntryPayload } from './createEntryPayload.js';
3
2
  export class WalletClient {
4
- constructor({ wallet, nodeUrl }) {
3
+ constructor({ wallet }) {
5
4
  Object.defineProperty(this, "wallet", {
6
5
  enumerable: true,
7
6
  configurable: true,
8
7
  writable: true,
9
8
  value: void 0
10
9
  });
11
- Object.defineProperty(this, "client", {
12
- enumerable: true,
13
- configurable: true,
14
- writable: true,
15
- value: void 0
16
- });
17
10
  this.wallet = wallet;
18
- this.client = new AptosClient(nodeUrl);
19
11
  }
20
- async submitTransaction(payload, _ = undefined) {
21
- const request = payload.rawPayload;
22
- const { hash } = await this.wallet.signAndSubmitTransaction({
23
- type: 'entry_function_payload',
24
- ...request,
25
- arguments: request.arguments.map((arg) => {
26
- if (Array.isArray(arg)) {
27
- return arg.map((item) => item.toString());
28
- }
29
- else if (typeof arg === 'object') {
30
- throw new Error(`a value of struct type: ${arg} is not supported`);
31
- }
32
- else {
33
- return arg.toString();
34
- }
35
- }),
12
+ async submitTransaction(payload) {
13
+ return await this.wallet.signAndSubmitTransaction({
14
+ sender: this.wallet.account?.address ?? "",
15
+ data: {
16
+ ...payload,
17
+ functionArguments: payload.functionArguments.map((arg) => {
18
+ if (Array.isArray(arg)) {
19
+ return arg.map((item) => item.toString());
20
+ }
21
+ else if (typeof arg === 'object') {
22
+ throw new Error(`a value of struct type: ${arg} is not supported`);
23
+ }
24
+ else {
25
+ return arg.toString();
26
+ }
27
+ }),
28
+ }
36
29
  });
37
- const result = (await this.client.waitForTransactionWithResult(hash, {
38
- checkSuccess: true,
39
- }));
40
- return result;
41
30
  }
42
31
  useABI(abi) {
43
32
  return new Proxy({}, {
@@ -46,8 +35,8 @@ export class WalletClient {
46
35
  return (...args) => {
47
36
  const payload = createEntryPayload(abi, {
48
37
  function: functionName,
49
- type_arguments: args[0].type_arguments,
50
- arguments: args[0].arguments,
38
+ typeArguments: args[0].type_arguments,
39
+ functionArguments: args[0].arguments,
51
40
  });
52
41
  return this.submitTransaction(payload);
53
42
  };
@@ -1 +1 @@
1
- {"version":3,"file":"WalletClient.js","sourceRoot":"","sources":["../../../src/core/WalletClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAS,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAW7D,MAAM,OAAO,YAAY;IAIvB,YAAY,EAAE,MAAM,EAAE,OAAO,EAAuC;QAH5D;;;;;WAAe;QACf;;;;;WAAoB;QAG1B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAC5B,OAAqB,EACrB,IAA8B,SAAS;QAEvC,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;QAGnC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC;YAC1D,IAAI,EAAE,wBAAwB;YAC9B,GAAG,OAAO;YACV,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAQ,EAAE,EAAE;gBAC5C,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBAEtB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;iBAChD;qBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;oBAClC,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,mBAAmB,CAAC,CAAC;iBACpE;qBAAM;oBACL,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;iBACvB;YACH,CAAC,CAAC;SACH,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,4BAA4B,CAAC,IAAI,EAAE;YACnE,YAAY,EAAE,IAAI;SACnB,CAAC,CAAsC,CAAC;QAEzC,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,MAAM,CAAoB,GAAM;QACrC,OAAO,IAAI,KAAK,CAAC,EAAwB,EAAE;YACzC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE;gBACf,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACrC,OAAO,CAAC,GAAG,IAAI,EAAE,EAAE;oBACjB,MAAM,OAAO,GAAG,kBAAkB,CAAC,GAAG,EAAE;wBACtC,QAAQ,EAAE,YAAY;wBACtB,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc;wBACtC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;qBAC7B,CAAC,CAAC;oBACH,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;gBACzC,CAAC,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF"}
1
+ {"version":3,"file":"WalletClient.js","sourceRoot":"","sources":["../../../src/core/WalletClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAS7D,MAAM,OAAO,YAAY;IAGvB,YAAY,EAAE,MAAM,EAAuB;QAFnC;;;;;WAAe;QAGrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAC5B,OAAqB;QAIrB,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC;YAChD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,IAAI,EAAE;YAC1C,IAAI,EAAE;gBACJ,GAAG,OAAO;gBAEV,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAQ,EAAE,EAAE;oBAC5D,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;wBAEtB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;qBAChD;yBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;wBAClC,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,mBAAmB,CAAC,CAAC;qBACpE;yBAAM;wBACL,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;qBACvB;gBACH,CAAC,CAAC;aACH;SACF,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAoB,GAAM;QACrC,OAAO,IAAI,KAAK,CAAC,EAAwB,EAAE;YACzC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE;gBACf,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACrC,OAAO,CAAC,GAAG,IAAI,EAAE,EAAE;oBACjB,MAAM,OAAO,GAAG,kBAAkB,CAAC,GAAG,EAAE;wBACtC,QAAQ,EAAE,YAAY;wBACtB,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc;wBACrC,iBAAiB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;qBACrC,CAAC,CAAC;oBACH,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;gBACzC,CAAC,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF"}