@typemove/aptos 1.2.0-rc.1 → 1.2.0-rc.3
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.
- package/dist/cjs/aptos-chain-adapter.d.ts +4 -0
- package/dist/cjs/aptos-chain-adapter.d.ts.map +1 -1
- package/dist/cjs/aptos-chain-adapter.js +10 -8
- package/dist/cjs/aptos-chain-adapter.js.map +1 -1
- package/dist/cjs/codegen/codegen.d.ts.map +1 -1
- package/dist/cjs/codegen/codegen.js +2 -1
- package/dist/cjs/codegen/codegen.js.map +1 -1
- package/dist/cjs/move-coder.d.ts +2 -1
- package/dist/cjs/move-coder.d.ts.map +1 -1
- package/dist/cjs/move-coder.js +5 -4
- package/dist/cjs/move-coder.js.map +1 -1
- package/dist/esm/aptos-chain-adapter.d.ts +4 -0
- package/dist/esm/aptos-chain-adapter.d.ts.map +1 -1
- package/dist/esm/aptos-chain-adapter.js +11 -9
- package/dist/esm/aptos-chain-adapter.js.map +1 -1
- package/dist/esm/codegen/codegen.d.ts.map +1 -1
- package/dist/esm/codegen/codegen.js +2 -1
- package/dist/esm/codegen/codegen.js.map +1 -1
- package/dist/esm/move-coder.d.ts +2 -1
- package/dist/esm/move-coder.d.ts.map +1 -1
- package/dist/esm/move-coder.js +5 -4
- package/dist/esm/move-coder.js.map +1 -1
- package/package.json +2 -2
- package/src/aptos-chain-adapter.ts +14 -17
- package/src/codegen/codegen.ts +4 -3
- package/src/move-coder.ts +5 -4
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { ChainAdapter, TypeDescriptor, InternalMoveModule, InternalMoveStruct } from '@typemove/move';
|
|
2
|
+
import { AptosClient } from 'aptos';
|
|
2
3
|
import { Event, MoveModuleBytecode, MoveResource } from './move-types.js';
|
|
3
4
|
export declare class AptosChainAdapter extends ChainAdapter<MoveModuleBytecode, Event | MoveResource> {
|
|
5
|
+
client: AptosClient;
|
|
6
|
+
constructor(client: AptosClient);
|
|
4
7
|
fetchModules(account: string): Promise<MoveModuleBytecode[]>;
|
|
5
8
|
fetchModule(account: string, module: string): Promise<MoveModuleBytecode>;
|
|
6
9
|
toInternalModules(modules: MoveModuleBytecode[]): InternalMoveModule[];
|
|
@@ -8,5 +11,6 @@ export declare class AptosChainAdapter extends ChainAdapter<MoveModuleBytecode,
|
|
|
8
11
|
getAllEventStructs(modules: InternalMoveModule[]): Map<string, InternalMoveStruct>;
|
|
9
12
|
getType(data: Event | MoveResource): string;
|
|
10
13
|
getData(data: Event | MoveResource): any;
|
|
14
|
+
getChainId(): Promise<string>;
|
|
11
15
|
}
|
|
12
16
|
//# sourceMappingURL=aptos-chain-adapter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aptos-chain-adapter.d.ts","sourceRoot":"","sources":["../../src/aptos-chain-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGZ,cAAc,EACd,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"aptos-chain-adapter.d.ts","sourceRoot":"","sources":["../../src/aptos-chain-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGZ,cAAc,EACd,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAEnC,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAGzE,qBAAa,iBAAkB,SAAQ,YAAY,CAAC,kBAAkB,EAAE,KAAK,GAAG,YAAY,CAAC;IAE3F,MAAM,EAAE,WAAW,CAAA;gBACP,MAAM,EAAE,WAAW;IAKzB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAI5D,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAI/E,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,EAAE,GAAG,kBAAkB,EAAE;IAItE,2BAA2B,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,cAAc,EAAE;IAUvE,kBAAkB,CAAC,OAAO,EAAE,kBAAkB,EAAE;IA2BhD,OAAO,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY,GAAG,MAAM;IAI3C,OAAO,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAO5B,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;CAMpC"}
|
|
@@ -2,17 +2,19 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AptosChainAdapter = void 0;
|
|
4
4
|
const move_1 = require("@typemove/move");
|
|
5
|
-
const aptos_1 = require("aptos");
|
|
6
5
|
const to_internal_js_1 = require("./to-internal.js");
|
|
7
6
|
class AptosChainAdapter extends move_1.ChainAdapter {
|
|
8
7
|
// static INSTANCE = new AptosChainAdapter()
|
|
8
|
+
client;
|
|
9
|
+
constructor(client) {
|
|
10
|
+
super();
|
|
11
|
+
this.client = client;
|
|
12
|
+
}
|
|
9
13
|
async fetchModules(account) {
|
|
10
|
-
|
|
11
|
-
return await client.getAccountModules(account);
|
|
14
|
+
return await this.client.getAccountModules(account);
|
|
12
15
|
}
|
|
13
16
|
async fetchModule(account, module) {
|
|
14
|
-
|
|
15
|
-
return await client.getAccountModule(account, module);
|
|
17
|
+
return await this.client.getAccountModule(account, module);
|
|
16
18
|
}
|
|
17
19
|
toInternalModules(modules) {
|
|
18
20
|
return modules.flatMap((m) => (m.abi ? [(0, to_internal_js_1.toInternalModule)(m)] : []));
|
|
@@ -60,9 +62,9 @@ class AptosChainAdapter extends move_1.ChainAdapter {
|
|
|
60
62
|
}
|
|
61
63
|
return data;
|
|
62
64
|
}
|
|
65
|
+
async getChainId() {
|
|
66
|
+
return (await this.client.getChainId()).toString();
|
|
67
|
+
}
|
|
63
68
|
}
|
|
64
69
|
exports.AptosChainAdapter = AptosChainAdapter;
|
|
65
|
-
function getRpcClient(network) {
|
|
66
|
-
return new aptos_1.AptosClient(network);
|
|
67
|
-
}
|
|
68
70
|
//# sourceMappingURL=aptos-chain-adapter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aptos-chain-adapter.js","sourceRoot":"","sources":["../../src/aptos-chain-adapter.ts"],"names":[],"mappings":";;;AAAA,yCAOuB;
|
|
1
|
+
{"version":3,"file":"aptos-chain-adapter.js","sourceRoot":"","sources":["../../src/aptos-chain-adapter.ts"],"names":[],"mappings":";;;AAAA,yCAOuB;AAIvB,qDAAmD;AAEnD,MAAa,iBAAkB,SAAQ,mBAAsD;IAC3F,4CAA4C;IAC5C,MAAM,CAAa;IACnB,YAAY,MAAmB;QAC7B,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAAe;QAChC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;IACrD,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAe,EAAE,MAAc;QAC/C,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IAC5D,CAAC;IAED,iBAAiB,CAAC,OAA6B;QAC7C,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,iCAAgB,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IACrE,CAAC;IAED,2BAA2B,CAAC,MAAwB;QAClD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,OAAO,MAAM,CAAA;SACd;QACD,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE;YACvD,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;SACzB;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAED,kBAAkB,CAAC,OAA6B;QAC9C,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA8B,CAAA;QACtD,MAAM,SAAS,GAAG,IAAI,GAAG,EAA8B,CAAA;QACvD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,MAAM,KAAK,GAAG,IAAA,kBAAW,EAAC,MAAM,CAAC,CAAA;YACjC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;gBACnC,SAAS,CAAC,GAAG,CAAC,KAAK,GAAG,eAAQ,GAAG,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;aACtD;SACF;QAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;gBACnC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE;oBACjC,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAA;oBACpB,IAAI,CAAC,CAAC,KAAK,KAAK,yBAAyB,EAAE;wBACzC,MAAM,KAAK,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;wBACjC,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;wBACxC,IAAI,WAAW,EAAE;4BACf,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;yBACjC;qBACF;iBACF;aACF;SACF;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,OAAO,CAAC,IAA0B;QAChC,OAAO,IAAI,CAAC,IAAI,CAAA;IAClB,CAAC;IAED,OAAO,CAAC,IAA0B;QAChC,IAAI,MAAM,IAAI,IAAI,IAAI,MAAM,IAAI,IAAI,EAAE;YACpC,OAAO,IAAI,CAAC,IAAI,CAAA;SACjB;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;IACpD,CAAC;CAIF;AA1ED,8CA0EC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codegen.d.ts","sourceRoot":"","sources":["../../../src/codegen/codegen.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAI1E,OAAO,EAAE,eAAe,EAAS,oBAAoB,EAAE,kBAAkB,EAAqB,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"codegen.d.ts","sourceRoot":"","sources":["../../../src/codegen/codegen.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAI1E,OAAO,EAAE,eAAe,EAAS,oBAAoB,EAAE,kBAAkB,EAAqB,MAAM,gBAAgB,CAAA;AAGpH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,MAAM,EACf,MAAM,oBAAgC,EACtC,QAAQ,EAAE,MAAM,EAChB,UAAU,UAAQ,EAClB,OAAO,UAAQ,iBAQhB;AAED,qBAAa,YAAa,SAAQ,eAAe,CAAC,kBAAkB,EAAE,KAAK,GAAG,YAAY,CAAC;IACzF,YAAY,SAAY;IACxB,MAAM,SAAU;IAChB,cAAc,SAAoB;gBAEtB,QAAQ,EAAE,MAAM;IAI5B,eAAe,IAAI,MAAM;IAMzB,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,kBAAkB;IAelD,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,kBAAkB,EAAE,IAAI,EAAE,oBAAoB,GAAG,MAAM;IA2C9F,SAAS,CAAC,wBAAwB,CAAC,MAAM,EAAE,kBAAkB,EAAE,IAAI,EAAE,oBAAoB,GAAG,MAAM;CAmCnG"}
|
|
@@ -7,6 +7,7 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
|
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const aptos_chain_adapter_js_1 = require("../aptos-chain-adapter.js");
|
|
9
9
|
const move_1 = require("@typemove/move");
|
|
10
|
+
const aptos_1 = require("aptos");
|
|
10
11
|
async function codegen(abisDir, outDir = (0, path_1.join)('src', 'types', 'aptos'), endpoint, genExample = false, builtin = false) {
|
|
11
12
|
if (!fs.existsSync(abisDir)) {
|
|
12
13
|
return;
|
|
@@ -21,7 +22,7 @@ class AptosCodegen extends move_1.AbstractCodegen {
|
|
|
21
22
|
PREFIX = 'Aptos';
|
|
22
23
|
SYSTEM_PACKAGE = '@typemove/aptos';
|
|
23
24
|
constructor(endpoint) {
|
|
24
|
-
super(new aptos_chain_adapter_js_1.AptosChainAdapter(endpoint));
|
|
25
|
+
super(new aptos_chain_adapter_js_1.AptosChainAdapter(new aptos_1.AptosClient(endpoint)));
|
|
25
26
|
}
|
|
26
27
|
generateImports() {
|
|
27
28
|
return `
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/codegen/codegen.ts"],"names":[],"mappings":";;;;AAAA,+CAAwB;AAExB,0DAAyB;AACzB,+BAA2B;AAC3B,sEAA6D;AAC7D,yCAAoH;
|
|
1
|
+
{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/codegen/codegen.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/move-coder.d.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { AbstractMoveCoder, InternalMoveModule, TypeDescriptor } from '@typemove/move';
|
|
2
2
|
import { Event, MoveModuleBytecode, MoveResource, TransactionPayload_EntryFunctionPayload } from './move-types.js';
|
|
3
3
|
import { TypedEventInstance, TypedMoveResource } from './models.js';
|
|
4
|
+
import { AptosClient } from 'aptos';
|
|
4
5
|
export declare class MoveCoder extends AbstractMoveCoder<MoveModuleBytecode, Event | MoveResource> {
|
|
5
|
-
constructor(
|
|
6
|
+
constructor(client: AptosClient);
|
|
6
7
|
load(module: MoveModuleBytecode): InternalMoveModule;
|
|
7
8
|
decodeEvent<T>(event: Event): Promise<TypedEventInstance<T> | undefined>;
|
|
8
9
|
filterAndDecodeEvents<T>(type: string | TypeDescriptor<T>, resources: Event[]): Promise<TypedEventInstance<T>[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"move-coder.d.ts","sourceRoot":"","sources":["../../src/move-coder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAiB,cAAc,EAAE,MAAM,gBAAgB,CAAA;AACrG,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,uCAAuC,EAAE,MAAM,iBAAiB,CAAA;AAClH,OAAO,EAAE,kBAAkB,EAAwB,iBAAiB,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"move-coder.d.ts","sourceRoot":"","sources":["../../src/move-coder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAiB,cAAc,EAAE,MAAM,gBAAgB,CAAA;AACrG,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,uCAAuC,EAAE,MAAM,iBAAiB,CAAA;AAClH,OAAO,EAAE,kBAAkB,EAAwB,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAGzF,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAEnC,qBAAa,SAAU,SAAQ,iBAAiB,CAAC,kBAAkB,EAAE,KAAK,GAAG,YAAY,CAAC;gBAC5E,MAAM,EAAE,WAAW;IAI/B,IAAI,CAAC,MAAM,EAAE,kBAAkB,GAAG,kBAAkB;IAgBpD,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAGxE,qBAAqB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC;IAMhH,cAAc,CAAC,CAAC,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAG/E,wBAAwB,CAAC,CAAC,EACxB,IAAI,EAAE,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,EAChC,SAAS,EAAE,YAAY,EAAE,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC;IAO5B,qBAAqB,CACzB,OAAO,EAAE,uCAAuC,GAC/C,OAAO,CAAC,uCAAuC,CAAC;CAUpD;AAeD,wBAAgB,gBAAgB,CAAC,QAAQ,GAAE,MAAyB,GAAG,SAAS,CAO/E"}
|
package/dist/cjs/move-coder.js
CHANGED
|
@@ -4,9 +4,10 @@ exports.defaultMoveCoder = exports.MoveCoder = void 0;
|
|
|
4
4
|
const move_1 = require("@typemove/move");
|
|
5
5
|
const aptos_chain_adapter_js_1 = require("./aptos-chain-adapter.js");
|
|
6
6
|
const to_internal_js_1 = require("./to-internal.js");
|
|
7
|
+
const aptos_1 = require("aptos");
|
|
7
8
|
class MoveCoder extends move_1.AbstractMoveCoder {
|
|
8
|
-
constructor(
|
|
9
|
-
super(new aptos_chain_adapter_js_1.AptosChainAdapter(
|
|
9
|
+
constructor(client) {
|
|
10
|
+
super(new aptos_chain_adapter_js_1.AptosChainAdapter(client));
|
|
10
11
|
}
|
|
11
12
|
load(module) {
|
|
12
13
|
if (!module.abi) {
|
|
@@ -47,7 +48,7 @@ class MoveCoder extends move_1.AbstractMoveCoder {
|
|
|
47
48
|
const argumentsDecoded = await this.decodeArray(payload.arguments, params);
|
|
48
49
|
return {
|
|
49
50
|
...payload,
|
|
50
|
-
arguments_decoded: argumentsDecoded
|
|
51
|
+
arguments_decoded: argumentsDecoded
|
|
51
52
|
};
|
|
52
53
|
}
|
|
53
54
|
}
|
|
@@ -66,7 +67,7 @@ const CODER_MAP = new Map();
|
|
|
66
67
|
function defaultMoveCoder(endpoint = DEFAULT_ENDPOINT) {
|
|
67
68
|
let coder = CODER_MAP.get(endpoint);
|
|
68
69
|
if (!coder) {
|
|
69
|
-
coder = new MoveCoder(
|
|
70
|
+
coder = new MoveCoder(new aptos_1.AptosClient(endpoint));
|
|
70
71
|
CODER_MAP.set(endpoint, coder);
|
|
71
72
|
}
|
|
72
73
|
return coder;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"move-coder.js","sourceRoot":"","sources":["../../src/move-coder.ts"],"names":[],"mappings":";;;AAAA,yCAAqG;AAGrG,qEAA4D;AAC5D,qDAAmD;
|
|
1
|
+
{"version":3,"file":"move-coder.js","sourceRoot":"","sources":["../../src/move-coder.ts"],"names":[],"mappings":";;;AAAA,yCAAqG;AAGrG,qEAA4D;AAC5D,qDAAmD;AACnD,iCAAmC;AAEnC,MAAa,SAAU,SAAQ,wBAA2D;IACxF,YAAY,MAAmB;QAC7B,KAAK,CAAC,IAAI,0CAAiB,CAAC,MAAM,CAAC,CAAC,CAAA;IACtC,CAAC;IAED,IAAI,CAAC,MAA0B;QAC7B,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;YACf,MAAM,KAAK,CAAC,oBAAoB,CAAC,CAAA;SAClC;QACD,IAAI,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAC3E,4DAA4D;QAC5D,WAAW;QACX,IAAI;QACJ,IAAI,CAAC,EAAE;YACL,OAAO,CAAC,CAAA;SACT;QACD,CAAC,GAAG,IAAA,iCAAgB,EAAC,MAAM,CAAC,CAAA;QAC5B,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;QACpB,OAAO,CAAC,CAAA;IACV,CAAC;IAED,WAAW,CAAI,KAAY;QACzB,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;IAClC,CAAC;IACD,qBAAqB,CAAI,IAAgC,EAAE,SAAkB;QAC3E,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC5B,IAAI,GAAG,IAAA,oBAAa,EAAC,IAAI,CAAC,CAAA;SAC3B;QACD,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;IACpD,CAAC;IACD,cAAc,CAAI,GAAiB;QACjC,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;IAChC,CAAC;IACD,wBAAwB,CACtB,IAAgC,EAChC,SAAyB;QAEzB,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC5B,IAAI,GAAG,IAAA,oBAAa,EAAC,IAAI,CAAC,CAAA;SAC3B;QACD,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;IACpD,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,OAAgD;QAEhD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QACzD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACpE,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QAE1E,OAAO;YACL,GAAG,OAAO;YACV,iBAAiB,EAAE,gBAAgB;SACP,CAAA;IAChC,CAAC;CACF;AAvDD,8BAuDC;AAED,0DAA0D;AAC1D,kEAAkE;AAClE,EAAE;AACF,+FAA+F;AAC/F,4CAA4C;AAC5C,wBAAwB;AACxB,MAAM;AACN,8BAA8B;AAC9B,IAAI;AAEJ,MAAM,gBAAgB,GAAG,gCAAgC,CAAA;AACzD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAqB,CAAA;AAE9C,SAAgB,gBAAgB,CAAC,WAAmB,gBAAgB;IAClE,IAAI,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACnC,IAAI,CAAC,KAAK,EAAE;QACV,KAAK,GAAG,IAAI,SAAS,CAAC,IAAI,mBAAW,CAAC,QAAQ,CAAC,CAAC,CAAA;QAChD,SAAS,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;KAC/B;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAPD,4CAOC"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { ChainAdapter, TypeDescriptor, InternalMoveModule, InternalMoveStruct } from '@typemove/move';
|
|
2
|
+
import { AptosClient } from 'aptos';
|
|
2
3
|
import { Event, MoveModuleBytecode, MoveResource } from './move-types.js';
|
|
3
4
|
export declare class AptosChainAdapter extends ChainAdapter<MoveModuleBytecode, Event | MoveResource> {
|
|
5
|
+
client: AptosClient;
|
|
6
|
+
constructor(client: AptosClient);
|
|
4
7
|
fetchModules(account: string): Promise<MoveModuleBytecode[]>;
|
|
5
8
|
fetchModule(account: string, module: string): Promise<MoveModuleBytecode>;
|
|
6
9
|
toInternalModules(modules: MoveModuleBytecode[]): InternalMoveModule[];
|
|
@@ -8,5 +11,6 @@ export declare class AptosChainAdapter extends ChainAdapter<MoveModuleBytecode,
|
|
|
8
11
|
getAllEventStructs(modules: InternalMoveModule[]): Map<string, InternalMoveStruct>;
|
|
9
12
|
getType(data: Event | MoveResource): string;
|
|
10
13
|
getData(data: Event | MoveResource): any;
|
|
14
|
+
getChainId(): Promise<string>;
|
|
11
15
|
}
|
|
12
16
|
//# sourceMappingURL=aptos-chain-adapter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aptos-chain-adapter.d.ts","sourceRoot":"","sources":["../../src/aptos-chain-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGZ,cAAc,EACd,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"aptos-chain-adapter.d.ts","sourceRoot":"","sources":["../../src/aptos-chain-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGZ,cAAc,EACd,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAEnC,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAGzE,qBAAa,iBAAkB,SAAQ,YAAY,CAAC,kBAAkB,EAAE,KAAK,GAAG,YAAY,CAAC;IAE3F,MAAM,EAAE,WAAW,CAAA;gBACP,MAAM,EAAE,WAAW;IAKzB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAI5D,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAI/E,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,EAAE,GAAG,kBAAkB,EAAE;IAItE,2BAA2B,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,cAAc,EAAE;IAUvE,kBAAkB,CAAC,OAAO,EAAE,kBAAkB,EAAE;IA2BhD,OAAO,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY,GAAG,MAAM;IAI3C,OAAO,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAO5B,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;CAMpC"}
|
|
@@ -1,15 +1,17 @@
|
|
|
1
|
-
import { ChainAdapter, moduleQname, SPLITTER
|
|
2
|
-
import { AptosClient } from 'aptos';
|
|
1
|
+
import { ChainAdapter, moduleQname, SPLITTER } from '@typemove/move';
|
|
3
2
|
import { toInternalModule } from './to-internal.js';
|
|
4
3
|
export class AptosChainAdapter extends ChainAdapter {
|
|
5
4
|
// static INSTANCE = new AptosChainAdapter()
|
|
5
|
+
client;
|
|
6
|
+
constructor(client) {
|
|
7
|
+
super();
|
|
8
|
+
this.client = client;
|
|
9
|
+
}
|
|
6
10
|
async fetchModules(account) {
|
|
7
|
-
|
|
8
|
-
return await client.getAccountModules(account);
|
|
11
|
+
return await this.client.getAccountModules(account);
|
|
9
12
|
}
|
|
10
13
|
async fetchModule(account, module) {
|
|
11
|
-
|
|
12
|
-
return await client.getAccountModule(account, module);
|
|
14
|
+
return await this.client.getAccountModule(account, module);
|
|
13
15
|
}
|
|
14
16
|
toInternalModules(modules) {
|
|
15
17
|
return modules.flatMap((m) => (m.abi ? [toInternalModule(m)] : []));
|
|
@@ -57,8 +59,8 @@ export class AptosChainAdapter extends ChainAdapter {
|
|
|
57
59
|
}
|
|
58
60
|
return data;
|
|
59
61
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
62
|
+
async getChainId() {
|
|
63
|
+
return (await this.client.getChainId()).toString();
|
|
64
|
+
}
|
|
63
65
|
}
|
|
64
66
|
//# sourceMappingURL=aptos-chain-adapter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aptos-chain-adapter.js","sourceRoot":"","sources":["../../src/aptos-chain-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,WAAW,EACX,QAAQ,
|
|
1
|
+
{"version":3,"file":"aptos-chain-adapter.js","sourceRoot":"","sources":["../../src/aptos-chain-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,WAAW,EACX,QAAQ,EAIT,MAAM,gBAAgB,CAAA;AAIvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAEnD,MAAM,OAAO,iBAAkB,SAAQ,YAAsD;IAC3F,4CAA4C;IAC5C,MAAM,CAAa;IACnB,YAAY,MAAmB;QAC7B,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAAe;QAChC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;IACrD,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAe,EAAE,MAAc;QAC/C,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IAC5D,CAAC;IAED,iBAAiB,CAAC,OAA6B;QAC7C,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IACrE,CAAC;IAED,2BAA2B,CAAC,MAAwB;QAClD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,OAAO,MAAM,CAAA;SACd;QACD,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE;YACvD,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;SACzB;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAED,kBAAkB,CAAC,OAA6B;QAC9C,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA8B,CAAA;QACtD,MAAM,SAAS,GAAG,IAAI,GAAG,EAA8B,CAAA;QACvD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAA;YACjC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;gBACnC,SAAS,CAAC,GAAG,CAAC,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;aACtD;SACF;QAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;gBACnC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE;oBACjC,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAA;oBACpB,IAAI,CAAC,CAAC,KAAK,KAAK,yBAAyB,EAAE;wBACzC,MAAM,KAAK,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;wBACjC,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;wBACxC,IAAI,WAAW,EAAE;4BACf,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;yBACjC;qBACF;iBACF;aACF;SACF;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,OAAO,CAAC,IAA0B;QAChC,OAAO,IAAI,CAAC,IAAI,CAAA;IAClB,CAAC;IAED,OAAO,CAAC,IAA0B;QAChC,IAAI,MAAM,IAAI,IAAI,IAAI,MAAM,IAAI,IAAI,EAAE;YACpC,OAAO,IAAI,CAAC,IAAI,CAAA;SACjB;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;IACpD,CAAC;CAIF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codegen.d.ts","sourceRoot":"","sources":["../../../src/codegen/codegen.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAI1E,OAAO,EAAE,eAAe,EAAS,oBAAoB,EAAE,kBAAkB,EAAqB,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"codegen.d.ts","sourceRoot":"","sources":["../../../src/codegen/codegen.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAI1E,OAAO,EAAE,eAAe,EAAS,oBAAoB,EAAE,kBAAkB,EAAqB,MAAM,gBAAgB,CAAA;AAGpH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,MAAM,EACf,MAAM,oBAAgC,EACtC,QAAQ,EAAE,MAAM,EAChB,UAAU,UAAQ,EAClB,OAAO,UAAQ,iBAQhB;AAED,qBAAa,YAAa,SAAQ,eAAe,CAAC,kBAAkB,EAAE,KAAK,GAAG,YAAY,CAAC;IACzF,YAAY,SAAY;IACxB,MAAM,SAAU;IAChB,cAAc,SAAoB;gBAEtB,QAAQ,EAAE,MAAM;IAI5B,eAAe,IAAI,MAAM;IAMzB,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,kBAAkB;IAelD,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,kBAAkB,EAAE,IAAI,EAAE,oBAAoB,GAAG,MAAM;IA2C9F,SAAS,CAAC,wBAAwB,CAAC,MAAM,EAAE,kBAAkB,EAAE,IAAI,EAAE,oBAAoB,GAAG,MAAM;CAmCnG"}
|
|
@@ -3,6 +3,7 @@ import chalk from 'chalk';
|
|
|
3
3
|
import { join } from 'path';
|
|
4
4
|
import { AptosChainAdapter } from '../aptos-chain-adapter.js';
|
|
5
5
|
import { AbstractCodegen, camel, normalizeToJSName } from '@typemove/move';
|
|
6
|
+
import { AptosClient } from 'aptos';
|
|
6
7
|
export async function codegen(abisDir, outDir = join('src', 'types', 'aptos'), endpoint, genExample = false, builtin = false) {
|
|
7
8
|
if (!fs.existsSync(abisDir)) {
|
|
8
9
|
return;
|
|
@@ -16,7 +17,7 @@ export class AptosCodegen extends AbstractCodegen {
|
|
|
16
17
|
PREFIX = 'Aptos';
|
|
17
18
|
SYSTEM_PACKAGE = '@typemove/aptos';
|
|
18
19
|
constructor(endpoint) {
|
|
19
|
-
super(new AptosChainAdapter(endpoint));
|
|
20
|
+
super(new AptosChainAdapter(new AptosClient(endpoint)));
|
|
20
21
|
}
|
|
21
22
|
generateImports() {
|
|
22
23
|
return `
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/codegen/codegen.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AAExB,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,KAAK,EAA4C,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/codegen/codegen.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/move-coder.d.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { AbstractMoveCoder, InternalMoveModule, TypeDescriptor } from '@typemove/move';
|
|
2
2
|
import { Event, MoveModuleBytecode, MoveResource, TransactionPayload_EntryFunctionPayload } from './move-types.js';
|
|
3
3
|
import { TypedEventInstance, TypedMoveResource } from './models.js';
|
|
4
|
+
import { AptosClient } from 'aptos';
|
|
4
5
|
export declare class MoveCoder extends AbstractMoveCoder<MoveModuleBytecode, Event | MoveResource> {
|
|
5
|
-
constructor(
|
|
6
|
+
constructor(client: AptosClient);
|
|
6
7
|
load(module: MoveModuleBytecode): InternalMoveModule;
|
|
7
8
|
decodeEvent<T>(event: Event): Promise<TypedEventInstance<T> | undefined>;
|
|
8
9
|
filterAndDecodeEvents<T>(type: string | TypeDescriptor<T>, resources: Event[]): Promise<TypedEventInstance<T>[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"move-coder.d.ts","sourceRoot":"","sources":["../../src/move-coder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAiB,cAAc,EAAE,MAAM,gBAAgB,CAAA;AACrG,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,uCAAuC,EAAE,MAAM,iBAAiB,CAAA;AAClH,OAAO,EAAE,kBAAkB,EAAwB,iBAAiB,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"move-coder.d.ts","sourceRoot":"","sources":["../../src/move-coder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAiB,cAAc,EAAE,MAAM,gBAAgB,CAAA;AACrG,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,uCAAuC,EAAE,MAAM,iBAAiB,CAAA;AAClH,OAAO,EAAE,kBAAkB,EAAwB,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAGzF,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAEnC,qBAAa,SAAU,SAAQ,iBAAiB,CAAC,kBAAkB,EAAE,KAAK,GAAG,YAAY,CAAC;gBAC5E,MAAM,EAAE,WAAW;IAI/B,IAAI,CAAC,MAAM,EAAE,kBAAkB,GAAG,kBAAkB;IAgBpD,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAGxE,qBAAqB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC;IAMhH,cAAc,CAAC,CAAC,EAAE,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAG/E,wBAAwB,CAAC,CAAC,EACxB,IAAI,EAAE,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,EAChC,SAAS,EAAE,YAAY,EAAE,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC;IAO5B,qBAAqB,CACzB,OAAO,EAAE,uCAAuC,GAC/C,OAAO,CAAC,uCAAuC,CAAC;CAUpD;AAeD,wBAAgB,gBAAgB,CAAC,QAAQ,GAAE,MAAyB,GAAG,SAAS,CAO/E"}
|
package/dist/esm/move-coder.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { AbstractMoveCoder, parseMoveType } from '@typemove/move';
|
|
2
2
|
import { AptosChainAdapter } from './aptos-chain-adapter.js';
|
|
3
3
|
import { toInternalModule } from './to-internal.js';
|
|
4
|
+
import { AptosClient } from 'aptos';
|
|
4
5
|
export class MoveCoder extends AbstractMoveCoder {
|
|
5
|
-
constructor(
|
|
6
|
-
super(new AptosChainAdapter(
|
|
6
|
+
constructor(client) {
|
|
7
|
+
super(new AptosChainAdapter(client));
|
|
7
8
|
}
|
|
8
9
|
load(module) {
|
|
9
10
|
if (!module.abi) {
|
|
@@ -44,7 +45,7 @@ export class MoveCoder extends AbstractMoveCoder {
|
|
|
44
45
|
const argumentsDecoded = await this.decodeArray(payload.arguments, params);
|
|
45
46
|
return {
|
|
46
47
|
...payload,
|
|
47
|
-
arguments_decoded: argumentsDecoded
|
|
48
|
+
arguments_decoded: argumentsDecoded
|
|
48
49
|
};
|
|
49
50
|
}
|
|
50
51
|
}
|
|
@@ -62,7 +63,7 @@ const CODER_MAP = new Map();
|
|
|
62
63
|
export function defaultMoveCoder(endpoint = DEFAULT_ENDPOINT) {
|
|
63
64
|
let coder = CODER_MAP.get(endpoint);
|
|
64
65
|
if (!coder) {
|
|
65
|
-
coder = new MoveCoder(
|
|
66
|
+
coder = new MoveCoder(new AptosClient(endpoint));
|
|
66
67
|
CODER_MAP.set(endpoint, coder);
|
|
67
68
|
}
|
|
68
69
|
return coder;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"move-coder.js","sourceRoot":"","sources":["../../src/move-coder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAsB,aAAa,EAAkB,MAAM,gBAAgB,CAAA;AAGrG,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"move-coder.js","sourceRoot":"","sources":["../../src/move-coder.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typemove/aptos",
|
|
3
|
-
"version": "1.2.0-rc.
|
|
3
|
+
"version": "1.2.0-rc.3",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"aptos": "^1.19.0",
|
|
33
33
|
"chalk": "^5.3.0",
|
|
34
34
|
"radash": "^11.0.0",
|
|
35
|
-
"@typemove/move": "1.2.0-rc.
|
|
35
|
+
"@typemove/move": "1.2.0-rc.3"
|
|
36
36
|
},
|
|
37
37
|
"url": "https://github.com/sentioxyz/typemove",
|
|
38
38
|
"scripts": {
|
|
@@ -4,30 +4,27 @@ import {
|
|
|
4
4
|
SPLITTER,
|
|
5
5
|
TypeDescriptor,
|
|
6
6
|
InternalMoveModule,
|
|
7
|
-
InternalMoveStruct
|
|
7
|
+
InternalMoveStruct
|
|
8
8
|
} from '@typemove/move'
|
|
9
9
|
import { AptosClient } from 'aptos'
|
|
10
10
|
|
|
11
11
|
import { Event, MoveModuleBytecode, MoveResource } from './move-types.js'
|
|
12
12
|
import { toInternalModule } from './to-internal.js'
|
|
13
13
|
|
|
14
|
-
export class AptosChainAdapter extends ChainAdapter<
|
|
15
|
-
MoveModuleBytecode,
|
|
16
|
-
Event | MoveResource
|
|
17
|
-
> {
|
|
14
|
+
export class AptosChainAdapter extends ChainAdapter<MoveModuleBytecode, Event | MoveResource> {
|
|
18
15
|
// static INSTANCE = new AptosChainAdapter()
|
|
16
|
+
client: AptosClient
|
|
17
|
+
constructor(client: AptosClient) {
|
|
18
|
+
super()
|
|
19
|
+
this.client = client
|
|
20
|
+
}
|
|
19
21
|
|
|
20
22
|
async fetchModules(account: string): Promise<MoveModuleBytecode[]> {
|
|
21
|
-
|
|
22
|
-
return await client.getAccountModules(account)
|
|
23
|
+
return await this.client.getAccountModules(account)
|
|
23
24
|
}
|
|
24
25
|
|
|
25
|
-
async fetchModule(
|
|
26
|
-
account
|
|
27
|
-
module: string
|
|
28
|
-
): Promise<MoveModuleBytecode> {
|
|
29
|
-
const client = getRpcClient(this.endpoint)
|
|
30
|
-
return await client.getAccountModule(account, module)
|
|
26
|
+
async fetchModule(account: string, module: string): Promise<MoveModuleBytecode> {
|
|
27
|
+
return await this.client.getAccountModule(account, module)
|
|
31
28
|
}
|
|
32
29
|
|
|
33
30
|
toInternalModules(modules: MoveModuleBytecode[]): InternalMoveModule[] {
|
|
@@ -81,11 +78,11 @@ export class AptosChainAdapter extends ChainAdapter<
|
|
|
81
78
|
}
|
|
82
79
|
return data
|
|
83
80
|
}
|
|
81
|
+
|
|
82
|
+
async getChainId(): Promise<string> {
|
|
83
|
+
return (await this.client.getChainId()).toString()
|
|
84
|
+
}
|
|
84
85
|
// validateAndNormalizeAddress(address: string): string {
|
|
85
86
|
// return validateAndNormalizeAddress(address)
|
|
86
87
|
// }
|
|
87
88
|
}
|
|
88
|
-
|
|
89
|
-
function getRpcClient(network: string): AptosClient {
|
|
90
|
-
return new AptosClient(network)
|
|
91
|
-
}
|
package/src/codegen/codegen.ts
CHANGED
|
@@ -4,6 +4,7 @@ import chalk from 'chalk'
|
|
|
4
4
|
import { join } from 'path'
|
|
5
5
|
import { AptosChainAdapter } from '../aptos-chain-adapter.js'
|
|
6
6
|
import { AbstractCodegen, camel, InternalMoveFunction, InternalMoveModule, normalizeToJSName } from '@typemove/move'
|
|
7
|
+
import { AptosClient } from 'aptos'
|
|
7
8
|
|
|
8
9
|
export async function codegen(
|
|
9
10
|
abisDir: string,
|
|
@@ -26,7 +27,7 @@ export class AptosCodegen extends AbstractCodegen<MoveModuleBytecode, Event | Mo
|
|
|
26
27
|
SYSTEM_PACKAGE = '@typemove/aptos'
|
|
27
28
|
|
|
28
29
|
constructor(endpoint: string) {
|
|
29
|
-
super(new AptosChainAdapter(endpoint))
|
|
30
|
+
super(new AptosChainAdapter(new AptosClient(endpoint)))
|
|
30
31
|
}
|
|
31
32
|
|
|
32
33
|
generateImports(): string {
|
|
@@ -122,8 +123,8 @@ export class AptosCodegen extends AbstractCodegen<MoveModuleBytecode, Event | Mo
|
|
|
122
123
|
const coder = defaultMoveCoder(client.nodeUrl)
|
|
123
124
|
const builder = new TransactionBuilderRemoteABI(client, { sender: account.address(), ...extraArgs });
|
|
124
125
|
const txn = await builder.build("${module.address}::${module.name}::${
|
|
125
|
-
|
|
126
|
-
|
|
126
|
+
func.name
|
|
127
|
+
}", request.type_arguments, coder.encodeArray(request.arguments))
|
|
127
128
|
const bcsTxn = AptosClient.generateBCSTransaction(account, txn)
|
|
128
129
|
return await client.submitSignedBCSTransaction(bcsTxn)
|
|
129
130
|
}`
|
package/src/move-coder.ts
CHANGED
|
@@ -3,10 +3,11 @@ import { Event, MoveModuleBytecode, MoveResource, TransactionPayload_EntryFuncti
|
|
|
3
3
|
import { TypedEventInstance, TypedFunctionPayload, TypedMoveResource } from './models.js'
|
|
4
4
|
import { AptosChainAdapter } from './aptos-chain-adapter.js'
|
|
5
5
|
import { toInternalModule } from './to-internal.js'
|
|
6
|
+
import { AptosClient } from 'aptos'
|
|
6
7
|
|
|
7
8
|
export class MoveCoder extends AbstractMoveCoder<MoveModuleBytecode, Event | MoveResource> {
|
|
8
|
-
constructor(
|
|
9
|
-
super(new AptosChainAdapter(
|
|
9
|
+
constructor(client: AptosClient) {
|
|
10
|
+
super(new AptosChainAdapter(client))
|
|
10
11
|
}
|
|
11
12
|
|
|
12
13
|
load(module: MoveModuleBytecode): InternalMoveModule {
|
|
@@ -56,7 +57,7 @@ export class MoveCoder extends AbstractMoveCoder<MoveModuleBytecode, Event | Mov
|
|
|
56
57
|
|
|
57
58
|
return {
|
|
58
59
|
...payload,
|
|
59
|
-
arguments_decoded: argumentsDecoded
|
|
60
|
+
arguments_decoded: argumentsDecoded
|
|
60
61
|
} as TypedFunctionPayload<any>
|
|
61
62
|
}
|
|
62
63
|
}
|
|
@@ -77,7 +78,7 @@ const CODER_MAP = new Map<string, MoveCoder>()
|
|
|
77
78
|
export function defaultMoveCoder(endpoint: string = DEFAULT_ENDPOINT): MoveCoder {
|
|
78
79
|
let coder = CODER_MAP.get(endpoint)
|
|
79
80
|
if (!coder) {
|
|
80
|
-
coder = new MoveCoder(
|
|
81
|
+
coder = new MoveCoder(new AptosClient(endpoint))
|
|
81
82
|
CODER_MAP.set(endpoint, coder)
|
|
82
83
|
}
|
|
83
84
|
return coder
|