@payload-exchange/solver-agent 0.0.2 → 0.0.4
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/commands/fulfill.js +1 -1
- package/dist/commands/fulfill.js.map +1 -1
- package/dist/commands/listen.d.ts.map +1 -1
- package/dist/commands/listen.js +12 -2
- package/dist/commands/listen.js.map +1 -1
- package/dist/commands/register.js +1 -1
- package/dist/commands/register.js.map +1 -1
- package/dist/commands/run.d.ts.map +1 -1
- package/dist/commands/run.js +29 -10
- package/dist/commands/run.js.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/lib/wallet.d.ts +2 -22
- package/dist/lib/wallet.d.ts.map +1 -1
- package/dist/lib/wallet.js +29 -9
- package/dist/lib/wallet.js.map +1 -1
- package/package.json +5 -6
package/dist/commands/fulfill.js
CHANGED
|
@@ -16,7 +16,7 @@ export const fulfillCommand = new Command("fulfill")
|
|
|
16
16
|
.action(async (_opts, cmd) => {
|
|
17
17
|
const opts = _opts;
|
|
18
18
|
const parent = cmd.parent?.opts();
|
|
19
|
-
const { address } = resolveWallet(parent.
|
|
19
|
+
const { address } = resolveWallet(parent.address, "solver");
|
|
20
20
|
const sellerAddress = opts.seller ?? address;
|
|
21
21
|
// Read result from one of three sources
|
|
22
22
|
let resultData;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fulfill.js","sourceRoot":"","sources":["../../src/commands/fulfill.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEhD,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,OAAO,CAAC,SAAS,CAAC;KAClD,WAAW,CAAC,iDAAiD,CAAC;KAC9D,cAAc,CAAC,cAAc,EAAE,UAAU,CAAC;KAC1C,MAAM,CAAC,iBAAiB,EAAE,uBAAuB,CAAC;KAClD,MAAM,CAAC,sBAAsB,EAAE,qCAAqC,CAAC;KACrE,MAAM,CAAC,gBAAgB,EAAE,6BAA6B,CAAC;KACvD,MAAM,CAAC,gBAAgB,EAAE,2BAA2B,CAAC;KACrD,MAAM,CAAC,qBAAqB,EAAE,oCAAoC,CAAC;KACnE,MAAM,CAAC,wBAAwB,EAAE,+BAA+B,CAAC;KACjE,MAAM,CAAC,oBAAoB,EAAE,yBAAyB,CAAC;KACvD,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;IAC5B,MAAM,IAAI,GAAG,KAAqD,CAAA;IAClE,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"fulfill.js","sourceRoot":"","sources":["../../src/commands/fulfill.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listen.d.ts","sourceRoot":"","sources":["../../src/commands/listen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAMnC,eAAO,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"listen.d.ts","sourceRoot":"","sources":["../../src/commands/listen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAMnC,eAAO,MAAM,aAAa,SA+GvB,CAAA"}
|
package/dist/commands/listen.js
CHANGED
|
@@ -13,7 +13,7 @@ export const listenCommand = new Command("listen")
|
|
|
13
13
|
.action(async (_opts, cmd) => {
|
|
14
14
|
const opts = _opts;
|
|
15
15
|
const parent = cmd.parent?.opts();
|
|
16
|
-
const { address } = resolveWallet(parent.
|
|
16
|
+
const { address } = resolveWallet(parent.address, "solver");
|
|
17
17
|
const sellerAddress = opts.seller ?? address;
|
|
18
18
|
const json = !!parent.json;
|
|
19
19
|
const taskClasses = opts.tasks ? opts.tasks.split(",").map((s) => s.trim()) : undefined;
|
|
@@ -51,8 +51,17 @@ export const listenCommand = new Command("listen")
|
|
|
51
51
|
try {
|
|
52
52
|
const resultStr = await execHandler(opts.exec, JSON.stringify(data), execTimeout);
|
|
53
53
|
let resultData;
|
|
54
|
+
let proofData;
|
|
54
55
|
try {
|
|
55
|
-
|
|
56
|
+
const parsed = JSON.parse(resultStr);
|
|
57
|
+
// If exec output has { result, proof }, extract both
|
|
58
|
+
if (parsed && typeof parsed === "object" && "result" in parsed) {
|
|
59
|
+
resultData = parsed.result;
|
|
60
|
+
proofData = parsed.proof;
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
resultData = parsed;
|
|
64
|
+
}
|
|
56
65
|
}
|
|
57
66
|
catch {
|
|
58
67
|
resultData = resultStr;
|
|
@@ -63,6 +72,7 @@ export const listenCommand = new Command("listen")
|
|
|
63
72
|
orderId: data.orderId,
|
|
64
73
|
sellerId: sellerAddress,
|
|
65
74
|
result: resultData,
|
|
75
|
+
proof: proofData,
|
|
66
76
|
});
|
|
67
77
|
if (response.attestation.success) {
|
|
68
78
|
log(`[solver] Attestation: PASSED`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listen.js","sourceRoot":"","sources":["../../src/commands/listen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEhD,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC;KAChD,WAAW,CAAC,oDAAoD,CAAC;KACjE,MAAM,CAAC,eAAe,EAAE,8CAA8C,CAAC;KACvE,MAAM,CAAC,kBAAkB,EAAE,+EAA+E,CAAC;KAC3G,MAAM,CAAC,qBAAqB,EAAE,4BAA4B,EAAE,OAAO,CAAC;KACpE,MAAM,CAAC,gBAAgB,EAAE,mDAAmD,CAAC;KAC7E,MAAM,CAAC,oBAAoB,EAAE,yBAAyB,CAAC;KACvD,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;IAC5B,MAAM,IAAI,GAAG,KAAqD,CAAA;IAClE,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"listen.js","sourceRoot":"","sources":["../../src/commands/listen.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ export const registerCommand = new Command("register")
|
|
|
15
15
|
.action(async (_opts, cmd) => {
|
|
16
16
|
const opts = _opts;
|
|
17
17
|
const parent = cmd.parent?.opts();
|
|
18
|
-
const { address } = resolveWallet(parent.
|
|
18
|
+
const { address } = resolveWallet(parent.address, "solver");
|
|
19
19
|
const sellerAddress = opts.seller ?? address;
|
|
20
20
|
const taskClasses = opts.tasks.split(",").map((s) => s.trim());
|
|
21
21
|
let executionTerms;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../src/commands/register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEhD,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,OAAO,CAAC,UAAU,CAAC;KACpD,WAAW,CAAC,gEAAgE,CAAC;KAC7E,cAAc,CAAC,eAAe,EAAE,8BAA8B,CAAC;KAC/D,cAAc,CAAC,aAAa,EAAE,sBAAsB,CAAC;KACrD,MAAM,CAAC,yBAAyB,EAAE,qDAAqD,EAAE,OAAO,CAAC;KACjG,MAAM,CAAC,aAAa,EAAE,cAAc,EAAE,GAAG,CAAC;KAC1C,MAAM,CAAC,0BAA0B,EAAE,gCAAgC,CAAC;KACpE,MAAM,CAAC,+BAA+B,EAAE,wCAAwC,CAAC;KACjF,MAAM,CAAC,oBAAoB,EAAE,uDAAuD,CAAC;KACrF,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;IAC5B,MAAM,IAAI,GAAG,KAA2C,CAAA;IACxD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../src/commands/register.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAQnC,eAAO,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAQnC,eAAO,MAAM,UAAU,SAqJpB,CAAA"}
|
package/dist/commands/run.js
CHANGED
|
@@ -18,7 +18,7 @@ export const runCommand = new Command("run")
|
|
|
18
18
|
.action(async (_opts, cmd) => {
|
|
19
19
|
const opts = _opts;
|
|
20
20
|
const parent = cmd.parent?.opts();
|
|
21
|
-
const { address } = resolveWallet(parent.
|
|
21
|
+
const { address } = resolveWallet(parent.address, "solver");
|
|
22
22
|
const sellerAddress = opts.seller ?? address;
|
|
23
23
|
const json = !!parent.json;
|
|
24
24
|
const taskClasses = opts.tasks.split(",").map((s) => s.trim());
|
|
@@ -30,19 +30,20 @@ export const runCommand = new Command("run")
|
|
|
30
30
|
executionTerms = JSON.parse(opts.executionTerms);
|
|
31
31
|
}
|
|
32
32
|
const client = new SolverClient(parent.coordinator);
|
|
33
|
+
const registerParams = {
|
|
34
|
+
seller: sellerAddress,
|
|
35
|
+
supportedTaskClasses: taskClasses,
|
|
36
|
+
pricingModel: (opts.pricingModel ?? "fixed"),
|
|
37
|
+
price: Number.parseFloat(opts.price),
|
|
38
|
+
stake: Number.parseFloat(opts.stake ?? "0"),
|
|
39
|
+
executionTerms,
|
|
40
|
+
};
|
|
33
41
|
// 1. Register
|
|
34
42
|
log(`[solver] Coordinator: ${parent.coordinator}`);
|
|
35
43
|
log(`[solver] Wallet: ${sellerAddress}`);
|
|
36
44
|
log(`[solver] Registering for: ${taskClasses.join(", ")}`);
|
|
37
45
|
try {
|
|
38
|
-
const reg = await client.register(
|
|
39
|
-
seller: sellerAddress,
|
|
40
|
-
supportedTaskClasses: taskClasses,
|
|
41
|
-
pricingModel: (opts.pricingModel ?? "fixed"),
|
|
42
|
-
price: Number.parseFloat(opts.price),
|
|
43
|
-
stake: Number.parseFloat(opts.stake ?? "0"),
|
|
44
|
-
executionTerms,
|
|
45
|
-
});
|
|
46
|
+
const reg = await client.register(registerParams);
|
|
46
47
|
log(`[solver] Registered: ${reg.id}`);
|
|
47
48
|
}
|
|
48
49
|
catch (err) {
|
|
@@ -76,8 +77,17 @@ export const runCommand = new Command("run")
|
|
|
76
77
|
try {
|
|
77
78
|
const resultStr = await execHandler(opts.exec, JSON.stringify(data), execTimeout);
|
|
78
79
|
let resultData;
|
|
80
|
+
let proofData;
|
|
79
81
|
try {
|
|
80
|
-
|
|
82
|
+
const parsed = JSON.parse(resultStr);
|
|
83
|
+
// If exec output has { result, proof }, extract both
|
|
84
|
+
if (parsed && typeof parsed === "object" && "result" in parsed) {
|
|
85
|
+
resultData = parsed.result;
|
|
86
|
+
proofData = parsed.proof;
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
resultData = parsed;
|
|
90
|
+
}
|
|
81
91
|
}
|
|
82
92
|
catch {
|
|
83
93
|
resultData = resultStr;
|
|
@@ -86,6 +96,7 @@ export const runCommand = new Command("run")
|
|
|
86
96
|
orderId: data.orderId,
|
|
87
97
|
sellerId: sellerAddress,
|
|
88
98
|
result: resultData,
|
|
99
|
+
proof: proofData,
|
|
89
100
|
});
|
|
90
101
|
if (response.attestation.success) {
|
|
91
102
|
const checks = response.attestation.checks ?? [];
|
|
@@ -99,6 +110,14 @@ export const runCommand = new Command("run")
|
|
|
99
110
|
catch (err) {
|
|
100
111
|
log(`[solver] Exec/fulfill failed: ${err.message}`);
|
|
101
112
|
}
|
|
113
|
+
// Re-register so we can serve the next buyer
|
|
114
|
+
try {
|
|
115
|
+
const reg = await client.register(registerParams);
|
|
116
|
+
log(`[solver] Re-registered: ${reg.id}`);
|
|
117
|
+
}
|
|
118
|
+
catch (err) {
|
|
119
|
+
log(`[solver] Re-registration failed: ${err.message}`);
|
|
120
|
+
}
|
|
102
121
|
continue;
|
|
103
122
|
}
|
|
104
123
|
if (event.event === "settlement_complete") {
|
package/dist/commands/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEhD,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,KAAK,CAAC;KAC1C,WAAW,CAAC,6DAA6D,CAAC;KAC1E,cAAc,CAAC,eAAe,EAAE,8BAA8B,CAAC;KAC/D,cAAc,CAAC,aAAa,EAAE,sBAAsB,CAAC;KACrD,cAAc,CAAC,kBAAkB,EAAE,8DAA8D,CAAC;KAClG,MAAM,CAAC,yBAAyB,EAAE,eAAe,EAAE,OAAO,CAAC;KAC3D,MAAM,CAAC,aAAa,EAAE,cAAc,EAAE,GAAG,CAAC;KAC1C,MAAM,CAAC,0BAA0B,EAAE,gCAAgC,CAAC;KACpE,MAAM,CAAC,+BAA+B,EAAE,wCAAwC,CAAC;KACjF,MAAM,CAAC,qBAAqB,EAAE,4BAA4B,EAAE,OAAO,CAAC;KACpE,MAAM,CAAC,oBAAoB,EAAE,yBAAyB,CAAC;KACvD,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;IAC5B,MAAM,IAAI,GAAG,KAA2C,CAAA;IACxD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEhD,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,KAAK,CAAC;KAC1C,WAAW,CAAC,6DAA6D,CAAC;KAC1E,cAAc,CAAC,eAAe,EAAE,8BAA8B,CAAC;KAC/D,cAAc,CAAC,aAAa,EAAE,sBAAsB,CAAC;KACrD,cAAc,CAAC,kBAAkB,EAAE,8DAA8D,CAAC;KAClG,MAAM,CAAC,yBAAyB,EAAE,eAAe,EAAE,OAAO,CAAC;KAC3D,MAAM,CAAC,aAAa,EAAE,cAAc,EAAE,GAAG,CAAC;KAC1C,MAAM,CAAC,0BAA0B,EAAE,gCAAgC,CAAC;KACpE,MAAM,CAAC,+BAA+B,EAAE,wCAAwC,CAAC;KACjF,MAAM,CAAC,qBAAqB,EAAE,4BAA4B,EAAE,OAAO,CAAC;KACpE,MAAM,CAAC,oBAAoB,EAAE,yBAAyB,CAAC;KACvD,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;IAC5B,MAAM,IAAI,GAAG,KAA2C,CAAA;IACxD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,IAAI,EAA+D,CAAA;IAE9F,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC3D,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,IAAI,OAAO,CAAA;IAC5C,MAAM,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAA;IAC1B,MAAM,WAAW,GAAI,IAAI,CAAC,KAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAgB,CAAA;IAEzF,IAAI,cAAmD,CAAA;IACvD,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC7B,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC,CAAA;IAC5E,CAAC;SAAM,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;QAChC,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IACjD,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;IACnD,MAAM,cAAc,GAAG;QACtB,MAAM,EAAE,aAAa;QACrB,oBAAoB,EAAE,WAAW;QACjC,YAAY,EAAE,CAAC,IAAI,CAAC,YAAY,IAAI,OAAO,CAAiB;QAC5D,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,KAAe,CAAC;QAC9C,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,IAAI,GAAG,CAAC;QAC3C,cAAc;KACd,CAAA;IAED,cAAc;IACd,GAAG,CAAC,yBAAyB,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;IAClD,GAAG,CAAC,oBAAoB,aAAa,EAAE,CAAC,CAAA;IACxC,GAAG,CAAC,6BAA6B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAE1D,IAAI,CAAC;QACJ,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAA;QACjD,GAAG,CAAC,wBAAwB,GAAG,CAAC,EAAE,EAAE,CAAC,CAAA;IACtC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,GAAG,CAAC,iCAAkC,GAAa,CAAC,OAAO,EAAE,CAAC,CAAA;QAC9D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAChB,CAAC;IAED,2BAA2B;IAC3B,GAAG,CAAC,mCAAmC,CAAC,CAAA;IAExC,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC,CAAA;IAElD,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACzB,GAAG,CAAC,6BAA6B,CAAC,CAAA;QAClC,UAAU,CAAC,KAAK,EAAE,CAAA;QAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAChB,CAAC,CAAC,CAAA;IAEF,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;QAC1B,UAAU,CAAC,KAAK,EAAE,CAAA;QAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAChB,CAAC,CAAC,CAAA;IAEF,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,IAAI,OAAO,EAAE,EAAE,CAAC,CAAA;IAEpE,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;QAC7C,IAAI,KAAK,CAAC,KAAK,KAAK,YAAY,EAAE,CAAC;YAClC,GAAG,CAAC,0BAA0B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACvD,SAAQ;QACT,CAAC;QAED,IAAI,KAAK,CAAC,KAAK,KAAK,eAAe,EAAE,CAAC;YACrC,MAAM,IAAI,GAAG,KAAK,CAAC,IAOlB,CAAA;YAED,IAAI,IAAI,CAAC,MAAM,KAAK,aAAa;gBAAE,SAAQ;YAE3C,GAAG,CAAC,mBAAmB,IAAI,CAAC,OAAO,MAAM,IAAI,CAAC,MAAM,MAAM,IAAI,CAAC,WAAW,GAAG,CAAC,CAAA;YAC9E,GAAG,CAAC,qBAAqB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;YAErC,IAAI,CAAC;gBACJ,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,IAAc,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,CAAA;gBAE3F,IAAI,UAAmB,CAAA;gBACvB,IAAI,SAA8C,CAAA;gBAClD,IAAI,CAAC;oBACJ,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;oBACpC,qDAAqD;oBACrD,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;wBAChE,UAAU,GAAG,MAAM,CAAC,MAAM,CAAA;wBAC1B,SAAS,GAAG,MAAM,CAAC,KAA4C,CAAA;oBAChE,CAAC;yBAAM,CAAC;wBACP,UAAU,GAAG,MAAM,CAAA;oBACpB,CAAC;gBACF,CAAC;gBAAC,MAAM,CAAC;oBACR,UAAU,GAAG,SAAS,CAAA;gBACvB,CAAC;gBAED,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC;oBAC/C,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,QAAQ,EAAE,aAAa;oBACvB,MAAM,EAAE,UAAU;oBAClB,KAAK,EAAE,SAAS;iBAChB,CAAC,CAAA;gBAEF,IAAI,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;oBAClC,MAAM,MAAM,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,IAAI,EAAE,CAAA;oBAChD,GAAG,CAAC,iCAAiC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,CAAA;gBAChG,CAAC;qBAAM,CAAC;oBACP,GAAG,CAAC,kCAAkC,QAAQ,CAAC,WAAW,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC,CAAA;gBAClF,CAAC;gBAED,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;YACvB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,GAAG,CAAC,iCAAkC,GAAa,CAAC,OAAO,EAAE,CAAC,CAAA;YAC/D,CAAC;YAED,6CAA6C;YAC7C,IAAI,CAAC;gBACJ,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAA;gBACjD,GAAG,CAAC,2BAA2B,GAAG,CAAC,EAAE,EAAE,CAAC,CAAA;YACzC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,GAAG,CAAC,oCAAqC,GAAa,CAAC,OAAO,EAAE,CAAC,CAAA;YAClE,CAAC;YAED,SAAQ;QACT,CAAC;QAED,IAAI,KAAK,CAAC,KAAK,KAAK,qBAAqB,EAAE,CAAC;YAC3C,MAAM,IAAI,GAAG,KAAK,CAAC,IAAoE,CAAA;YACvF,GAAG,CAAC,mBAAmB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QAC3F,CAAC;QAED,gCAAgC;QAChC,IAAI,IAAI,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;QACpB,CAAC;IACF,CAAC;IAED,GAAG,CAAC,6BAA6B,CAAC,CAAA;AACnC,CAAC,CAAC,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -8,9 +8,9 @@ import { runCommand } from "./commands/run.js";
|
|
|
8
8
|
const program = new Command()
|
|
9
9
|
.name("px-solver")
|
|
10
10
|
.description("payload.exchange solver CLI — register, listen for matches, fulfill orders")
|
|
11
|
-
.version("0.0.
|
|
11
|
+
.version("0.0.4")
|
|
12
12
|
.option("--coordinator <url>", "Coordinator URL", process.env.COORDINATOR_URL ?? "https://px-test.fly.dev")
|
|
13
|
-
.option("--
|
|
13
|
+
.option("--address <addr>", "Override wallet address (default: from Tempo wallet)")
|
|
14
14
|
.option("--json", "Output raw JSON (stdout stays clean for piping)");
|
|
15
15
|
program.addCommand(registerCommand);
|
|
16
16
|
program.addCommand(orderCommand);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE;KAC3B,IAAI,CAAC,WAAW,CAAC;KACjB,WAAW,CAAC,4EAA4E,CAAC;KACzF,OAAO,CAAC,OAAO,CAAC;KAChB,MAAM,CAAC,qBAAqB,EAAE,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,yBAAyB,CAAC;KAC1G,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE;KAC3B,IAAI,CAAC,WAAW,CAAC;KACjB,WAAW,CAAC,4EAA4E,CAAC;KACzF,OAAO,CAAC,OAAO,CAAC;KAChB,MAAM,CAAC,qBAAqB,EAAE,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,yBAAyB,CAAC;KAC1G,MAAM,CAAC,kBAAkB,EAAE,sDAAsD,CAAC;KAClF,MAAM,CAAC,QAAQ,EAAE,iDAAiD,CAAC,CAAA;AAErE,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,CAAA;AACnC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,CAAA;AAChC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;AACjC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CAAA;AAClC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;AAE9B,OAAO,CAAC,KAAK,EAAE,CAAA"}
|
package/dist/lib/wallet.d.ts
CHANGED
|
@@ -1,24 +1,4 @@
|
|
|
1
|
-
export declare function resolveWallet(
|
|
2
|
-
|
|
3
|
-
account: {
|
|
4
|
-
address: import("abitype").Address;
|
|
5
|
-
nonceManager?: import("viem").NonceManager | undefined;
|
|
6
|
-
sign: (parameters: {
|
|
7
|
-
hash: import("viem").Hash;
|
|
8
|
-
}) => Promise<import("viem").Hex>;
|
|
9
|
-
signAuthorization: (parameters: import("viem").AuthorizationRequest) => Promise<import("viem/accounts").SignAuthorizationReturnType>;
|
|
10
|
-
signMessage: ({ message }: {
|
|
11
|
-
message: import("viem").SignableMessage;
|
|
12
|
-
}) => Promise<import("viem").Hex>;
|
|
13
|
-
signTransaction: <serializer extends import("viem").SerializeTransactionFn<import("viem").TransactionSerializable> = import("viem").SerializeTransactionFn<import("viem").TransactionSerializable>, transaction extends Parameters<serializer>[0] = Parameters<serializer>[0]>(transaction: transaction, options?: {
|
|
14
|
-
serializer?: serializer | undefined;
|
|
15
|
-
} | undefined) => Promise<import("viem").Hex>;
|
|
16
|
-
signTypedData: <const typedData extends import("abitype").TypedData | Record<string, unknown>, primaryType extends keyof typedData | "EIP712Domain" = keyof typedData>(parameters: import("viem").TypedDataDefinition<typedData, primaryType>) => Promise<import("viem").Hex>;
|
|
17
|
-
publicKey: import("viem").Hex;
|
|
18
|
-
source: "privateKey";
|
|
19
|
-
type: "local";
|
|
20
|
-
};
|
|
21
|
-
address: `0x${string}`;
|
|
22
|
-
hasKey: boolean;
|
|
1
|
+
export declare function resolveWallet(addressOverride: string | undefined, label: string): {
|
|
2
|
+
address: string;
|
|
23
3
|
};
|
|
24
4
|
//# sourceMappingURL=wallet.d.ts.map
|
package/dist/lib/wallet.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../src/lib/wallet.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../src/lib/wallet.ts"],"names":[],"mappings":"AAaA,wBAAgB,aAAa,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM;;EAmB/E"}
|
package/dist/lib/wallet.js
CHANGED
|
@@ -1,12 +1,32 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { execSync } from "node:child_process";
|
|
2
2
|
import { log } from "./output.js";
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
}
|
|
10
|
-
|
|
3
|
+
function findTempoCli() {
|
|
4
|
+
try {
|
|
5
|
+
const which = execSync("which tempo", { encoding: "utf-8" }).trim();
|
|
6
|
+
if (which)
|
|
7
|
+
return which;
|
|
8
|
+
}
|
|
9
|
+
catch { /* not on PATH */ }
|
|
10
|
+
const home = process.env.HOME ?? process.env.USERPROFILE ?? "";
|
|
11
|
+
return `${home}/.tempo/bin/tempo`;
|
|
12
|
+
}
|
|
13
|
+
export function resolveWallet(addressOverride, label) {
|
|
14
|
+
if (addressOverride) {
|
|
15
|
+
log(`[${label}] Wallet: ${addressOverride} (manual override)`);
|
|
16
|
+
return { address: addressOverride };
|
|
17
|
+
}
|
|
18
|
+
const tempoCli = findTempoCli();
|
|
19
|
+
try {
|
|
20
|
+
const raw = execSync(`"${tempoCli}" wallet whoami`, { encoding: "utf-8" });
|
|
21
|
+
const info = JSON.parse(raw);
|
|
22
|
+
const address = info.wallet;
|
|
23
|
+
log(`[${label}] Wallet: ${address} (from Tempo)`);
|
|
24
|
+
return { address };
|
|
25
|
+
}
|
|
26
|
+
catch {
|
|
27
|
+
log(`[${label}] Error: Tempo wallet not available. Run: tempo wallet login`);
|
|
28
|
+
log(`[${label}] Or pass --address to override.`);
|
|
29
|
+
process.exit(1);
|
|
30
|
+
}
|
|
11
31
|
}
|
|
12
32
|
//# sourceMappingURL=wallet.js.map
|
package/dist/lib/wallet.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../src/lib/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../src/lib/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC7C,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAEjC,SAAS,YAAY;IACpB,IAAI,CAAC;QACJ,MAAM,KAAK,GAAG,QAAQ,CAAC,aAAa,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;QACnE,IAAI,KAAK;YAAE,OAAO,KAAK,CAAA;IACxB,CAAC;IAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;IAE7B,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAA;IAC9D,OAAO,GAAG,IAAI,mBAAmB,CAAA;AAClC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,eAAmC,EAAE,KAAa;IAC/E,IAAI,eAAe,EAAE,CAAC;QACrB,GAAG,CAAC,IAAI,KAAK,aAAa,eAAe,oBAAoB,CAAC,CAAA;QAC9D,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,CAAA;IACpC,CAAC;IAED,MAAM,QAAQ,GAAG,YAAY,EAAE,CAAA;IAE/B,IAAI,CAAC;QACJ,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAI,QAAQ,iBAAiB,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAA;QAC1E,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,MAAgB,CAAA;QACrC,GAAG,CAAC,IAAI,KAAK,aAAa,OAAO,eAAe,CAAC,CAAA;QACjD,OAAO,EAAE,OAAO,EAAE,CAAA;IACnB,CAAC;IAAC,MAAM,CAAC;QACR,GAAG,CAAC,IAAI,KAAK,8DAA8D,CAAC,CAAA;QAC5E,GAAG,CAAC,IAAI,KAAK,kCAAkC,CAAC,CAAA;QAChD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAChB,CAAC;AACF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@payload-exchange/solver-agent",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.4",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"bin": {
|
|
6
6
|
"px-solver": "./dist/index.js"
|
|
@@ -14,13 +14,12 @@
|
|
|
14
14
|
"clean": "rm -rf dist"
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@payload-exchange/solver-sdk": "
|
|
18
|
-
"@payload-exchange/protocol": "
|
|
19
|
-
"commander": "^13.0.0"
|
|
20
|
-
"viem": "^2.0.0"
|
|
17
|
+
"@payload-exchange/solver-sdk": "0.0.2",
|
|
18
|
+
"@payload-exchange/protocol": "0.0.2",
|
|
19
|
+
"commander": "^13.0.0"
|
|
21
20
|
},
|
|
22
21
|
"devDependencies": {
|
|
23
|
-
"@payload-exchange/tsconfig": "
|
|
22
|
+
"@payload-exchange/tsconfig": "0.0.0",
|
|
24
23
|
"@types/bun": "^1.3.11",
|
|
25
24
|
"typescript": "^5.7.0"
|
|
26
25
|
}
|