@eco-incorp/sauce 0.99.0 → 0.99.2
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/LICENSE.md +29 -0
- package/README.md +69 -249
- package/actions/dist/to-sauce.d.ts.map +1 -1
- package/actions/dist/to-sauce.js +4 -5
- package/dev-tools/README.md +11 -170
- package/docs/README.md +39 -0
- package/docs/api/README.md +71 -0
- package/docs/api/compiler.md +234 -0
- package/docs/api/coverage.md +117 -0
- package/docs/api/routes.md +110 -0
- package/docs/concepts/architecture.md +134 -0
- package/docs/concepts/saucescript.md +172 -0
- package/docs/examples/README.md +34 -0
- package/docs/examples/compile-program.ts +20 -0
- package/docs/examples/evm-execution.ts +59 -0
- package/docs/examples/first-intent.ts +56 -0
- package/docs/examples/protocol-approval.ts +33 -0
- package/docs/guides/builders-and-actions.md +108 -0
- package/docs/guides/compiling.md +264 -0
- package/docs/guides/intents.md +158 -0
- package/docs/guides/nested-intents.md +79 -0
- package/docs/guides/protocols-and-tokens.md +116 -0
- package/docs/guides/quick-start.md +64 -0
- package/docs/guides/solana.md +196 -0
- package/docs/guides/verification.md +253 -0
- package/package.json +9 -4
- package/sdk/dist/artifacts/V12Deployments.json +82 -0
- package/sdk/dist/artifacts/V12RuntimeBytecode.json +1 -1
- package/sdk/dist/artifacts/svm/engine-devnet.so +0 -0
- package/sdk/dist/artifacts/svm/engine-mainnet.so +0 -0
- package/sdk/dist/artifacts/svm/engine-wire-devnet.json +3 -3
- package/sdk/dist/artifacts/svm/engine-wire-mainnet.json +3 -3
- package/sdk/dist/deployments/index.d.ts +15 -39
- package/sdk/dist/deployments/index.d.ts.map +1 -1
- package/sdk/dist/deployments/index.js +23 -39
- package/sdk/dist/deployments/index.js.map +1 -1
- package/sdk/dist/deployments/v12-addresses.d.ts +85 -0
- package/sdk/dist/deployments/v12-addresses.d.ts.map +1 -0
- package/sdk/dist/deployments/v12-addresses.js +51 -0
- package/sdk/dist/deployments/v12-addresses.js.map +1 -0
- package/sdk/dist/deployments/v12.generated.d.ts +3 -3
- package/sdk/dist/deployments/v12.generated.d.ts.map +1 -1
- package/sdk/dist/deployments/v12.generated.js +3 -3
- package/sdk/dist/deployments/v12.generated.js.map +1 -1
- package/sdk/dist/deposit/index.d.ts +28 -102
- package/sdk/dist/deposit/index.d.ts.map +1 -1
- package/sdk/dist/deposit/index.js.map +1 -1
- package/sdk/dist/deposit/params.d.ts +1 -1
- package/sdk/dist/deposit/params.js +2 -2
- package/sdk/dist/deposit/params.js.map +1 -1
- package/sdk/dist/deposit/source.d.ts +1 -1
- package/sdk/dist/deposit/source.d.ts.map +1 -1
- package/sdk/dist/deposit/source.js +18 -33
- package/sdk/dist/deposit/source.js.map +1 -1
- package/sdk/dist/deposit/types.d.ts +5 -4
- package/sdk/dist/deposit/types.d.ts.map +1 -1
- package/sdk/dist/evm/engine.d.ts +32 -0
- package/sdk/dist/evm/engine.d.ts.map +1 -1
- package/sdk/dist/evm/engine.js +2 -0
- package/sdk/dist/evm/engine.js.map +1 -1
- package/sdk/dist/index.d.ts +1 -0
- package/sdk/dist/index.d.ts.map +1 -1
- package/sdk/dist/index.js +2 -0
- package/sdk/dist/index.js.map +1 -1
- package/sdk/dist/plugin/index.d.ts +16 -41
- package/sdk/dist/plugin/index.d.ts.map +1 -1
- package/sdk/dist/plugin/index.js +2 -6
- package/sdk/dist/plugin/index.js.map +1 -1
- package/sdk/dist/recipes/index.js +2 -2
- package/sdk/dist/recipes/settle.sauce.ts +1 -1
- package/sdk/dist/routes/index.d.ts +3 -3
- package/sdk/dist/routes/index.js +3 -3
- package/sdk/dist/routes/intent-dsl.d.ts +23 -10
- package/sdk/dist/routes/intent-dsl.d.ts.map +1 -1
- package/sdk/dist/routes/intent-dsl.js +19 -2
- package/sdk/dist/routes/intent-dsl.js.map +1 -1
- package/sdk/dist/routes/nest.d.ts +23 -0
- package/sdk/dist/routes/nest.d.ts.map +1 -1
- package/sdk/dist/routes/nest.js +2 -4
- package/sdk/dist/routes/nest.js.map +1 -1
- package/sdk/dist/routes/protocol-rewrite.d.ts +2 -2
- package/sdk/dist/routes/protocol-rewrite.d.ts.map +1 -1
- package/sdk/dist/routes/protocol-rewrite.js +19 -35
- package/sdk/dist/routes/protocol-rewrite.js.map +1 -1
- package/sdk/dist/routes/sauce-calls.d.ts +7 -13
- package/sdk/dist/routes/sauce-calls.d.ts.map +1 -1
- package/sdk/dist/routes/sauce-calls.js +6 -11
- package/sdk/dist/routes/sauce-calls.js.map +1 -1
- package/sdk/dist/routes/sauce-route.d.ts +24 -53
- package/sdk/dist/routes/sauce-route.d.ts.map +1 -1
- package/sdk/dist/routes/sauce-route.js +5 -6
- package/sdk/dist/routes/sauce-route.js.map +1 -1
- package/sdk/dist/routes/source-globals.generated.d.ts +931 -0
- package/sdk/dist/routes/source-globals.generated.d.ts.map +1 -0
- package/sdk/dist/routes/source-globals.generated.js +7 -0
- package/sdk/dist/routes/source-globals.generated.js.map +1 -0
- package/sdk/dist/std/token/token.svm.js +19 -14
- package/sdk/dist/svm/cpi-probe.d.ts +1 -1
- package/sdk/dist/svm/cpi-probe.d.ts.map +1 -1
- package/sdk/dist/svm/cpi-probe.js +5 -2
- package/sdk/dist/svm/cpi-probe.js.map +1 -1
- package/sdk/dist/svm/intent.d.ts +12 -40
- package/sdk/dist/svm/intent.d.ts.map +1 -1
- package/sdk/dist/svm/intent.js +22 -66
- package/sdk/dist/svm/intent.js.map +1 -1
- package/sdk/dist/svm/venues/byreal/index.d.ts.map +1 -1
- package/sdk/dist/svm/venues/byreal/index.js +4 -1
- package/sdk/dist/svm/venues/byreal/index.js.map +1 -1
- package/sdk/dist/svm/venues/carrot/index.d.ts.map +1 -1
- package/sdk/dist/svm/venues/carrot/index.js +4 -0
- package/sdk/dist/svm/venues/carrot/index.js.map +1 -1
- package/sdk/dist/svm/venues/cropper/index.d.ts +1 -1
- package/sdk/dist/svm/venues/cropper/index.js +1 -1
- package/sdk/dist/svm/venues/huma/index.d.ts.map +1 -1
- package/sdk/dist/svm/venues/huma/index.js +4 -1
- package/sdk/dist/svm/venues/huma/index.js.map +1 -1
- package/sdk/dist/svm/venues/index.d.ts +1 -0
- package/sdk/dist/svm/venues/index.d.ts.map +1 -1
- package/sdk/dist/svm/venues/index.js +1 -0
- package/sdk/dist/svm/venues/index.js.map +1 -1
- package/sdk/dist/svm/venues/math.d.ts +4 -1
- package/sdk/dist/svm/venues/math.d.ts.map +1 -1
- package/sdk/dist/svm/venues/math.js +4 -1
- package/sdk/dist/svm/venues/math.js.map +1 -1
- package/sdk/dist/svm/venues/meteora-damm-v1-stable/index.d.ts.map +1 -1
- package/sdk/dist/svm/venues/meteora-damm-v1-stable/index.js +4 -1
- package/sdk/dist/svm/venues/meteora-damm-v1-stable/index.js.map +1 -1
- package/sdk/dist/svm/venues/meteora-damm-v2/index.d.ts.map +1 -1
- package/sdk/dist/svm/venues/meteora-damm-v2/index.js +5 -2
- package/sdk/dist/svm/venues/meteora-damm-v2/index.js.map +1 -1
- package/sdk/dist/svm/venues/obric-v2/index.d.ts.map +1 -1
- package/sdk/dist/svm/venues/obric-v2/index.js +16 -5
- package/sdk/dist/svm/venues/obric-v2/index.js.map +1 -1
- package/sdk/dist/svm/venues/oracle-exponent.d.ts +82 -0
- package/sdk/dist/svm/venues/oracle-exponent.d.ts.map +1 -0
- package/sdk/dist/svm/venues/oracle-exponent.js +97 -0
- package/sdk/dist/svm/venues/oracle-exponent.js.map +1 -0
- package/sdk/dist/svm/venues/orca-legacy-token-swap/index.d.ts.map +1 -1
- package/sdk/dist/svm/venues/orca-legacy-token-swap/index.js +4 -1
- package/sdk/dist/svm/venues/orca-legacy-token-swap/index.js.map +1 -1
- package/sdk/dist/svm/venues/pumpswap/index.d.ts.map +1 -1
- package/sdk/dist/svm/venues/pumpswap/index.js +19 -13
- package/sdk/dist/svm/venues/pumpswap/index.js.map +1 -1
- package/sdk/dist/svm/venues/raydium-amm-v4/index.d.ts.map +1 -1
- package/sdk/dist/svm/venues/raydium-amm-v4/index.js +4 -1
- package/sdk/dist/svm/venues/raydium-amm-v4/index.js.map +1 -1
- package/sdk/dist/svm/venues/raydium-clmm/index.d.ts.map +1 -1
- package/sdk/dist/svm/venues/raydium-clmm/index.js +4 -1
- package/sdk/dist/svm/venues/raydium-clmm/index.js.map +1 -1
- package/sdk/dist/svm/venues/raydium-cp-swap/index.d.ts.map +1 -1
- package/sdk/dist/svm/venues/raydium-cp-swap/index.js +4 -1
- package/sdk/dist/svm/venues/raydium-cp-swap/index.js.map +1 -1
- package/sdk/dist/svm/venues/scorch/index.d.ts.map +1 -1
- package/sdk/dist/svm/venues/scorch/index.js +4 -1
- package/sdk/dist/svm/venues/scorch/index.js.map +1 -1
- package/sdk/dist/svm/venues/stabble-common.d.ts +1 -1
- package/sdk/dist/svm/venues/stabble-common.js +1 -1
- package/sdk/dist/svm/venues/types.d.ts +4 -1
- package/sdk/dist/svm/venues/types.d.ts.map +1 -1
- package/sdk/dist/svm/venues/woofi/index.d.ts.map +1 -1
- package/sdk/dist/svm/venues/woofi/index.js +4 -0
- package/sdk/dist/svm/venues/woofi/index.js.map +1 -1
- package/sdk/dist/svm/verify.d.ts +27 -133
- package/sdk/dist/svm/verify.d.ts.map +1 -1
- package/sdk/dist/svm/verify.js +72 -139
- package/sdk/dist/svm/verify.js.map +1 -1
- package/sdk/dist/swap/index.d.ts +16 -59
- package/sdk/dist/swap/index.d.ts.map +1 -1
- package/sdk/dist/swap/index.js +16 -59
- package/sdk/dist/swap/index.js.map +1 -1
- package/sdk/dist/token/source.d.ts.map +1 -1
- package/sdk/dist/token/source.js +4 -1
- package/sdk/dist/token/source.js.map +1 -1
- package/sdk/dist/verify/decode.d.ts +6 -6
- package/sdk/dist/verify/decode.js +7 -7
- package/sdk/dist/verify/index.js +2 -2
- package/sdk/dist/verify/intent.js +2 -2
- package/sdk/dist/verify/vectors.d.ts +1 -1
- package/sdk/dist/verify/vectors.d.ts.map +1 -1
- package/sdk/dist/verify/vectors.js +2 -2
- package/sdk/dist/verify/vectors.js.map +1 -1
- package/sdk/dist/verify/wire.d.ts +7 -4
- package/sdk/dist/verify/wire.d.ts.map +1 -1
- package/sdk/dist/verify/wire.js +7 -4
- package/sdk/dist/verify/wire.js.map +1 -1
package/sdk/dist/evm/engine.js
CHANGED
|
@@ -25,12 +25,14 @@ export const v12PotAbi = parseAbi([
|
|
|
25
25
|
"function cook(address engine, bytes program) payable returns (bytes)",
|
|
26
26
|
"function inFlightEngine() view returns (address)",
|
|
27
27
|
"function owner() view returns (address)",
|
|
28
|
+
"function kitchen() view returns (address)",
|
|
28
29
|
"function router() view returns (address)",
|
|
29
30
|
]);
|
|
30
31
|
/** V12Kitchen — CREATE2 Pot factory. `deployPot` bakes `owner` into the Pot's CREATE2 address. */
|
|
31
32
|
export const v12KitchenAbi = parseAbi([
|
|
32
33
|
"function deployPot(address owner, bytes32 salt) returns (address pot)",
|
|
33
34
|
"function predictPot(address owner, bytes32 salt) view returns (address)",
|
|
35
|
+
"function executionFee() view returns (uint256)",
|
|
34
36
|
"function router() view returns (address)",
|
|
35
37
|
]);
|
|
36
38
|
/** Ready-to-use V12Pot handle: the viem ABI plus calldata encoders for route/batch legs. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine.js","sourceRoot":"","sources":["../../src/evm/engine.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF,EAAE;AACF,iGAAiG;AACjG,6FAA6F;AAC7F,0FAA0F;AAC1F,gGAAgG;AAChG,sBAAsB;AACtB,EAAE;AACF,kGAAkG;AAClG,gGAAgG;AAChG,oGAAoG;AACpG,6FAA6F;AAE7F,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAA0B,MAAM,MAAM,CAAC;AAE5E;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,QAAQ,CAAC;IAChC,sEAAsE;IACtE,kDAAkD;IAClD,yCAAyC;IACzC,0CAA0C;CAC3C,CAAC,CAAC;AAEH,kGAAkG;AAClG,MAAM,CAAC,MAAM,aAAa,GAAG,QAAQ,CAAC;IACpC,uEAAuE;IACvE,yEAAyE;IACzE,0CAA0C;CAC3C,CAAC,CAAC;AAEH,4FAA4F;AAC5F,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,GAAG,EAAE,SAAS;IACd;;;;;;OAMG;IACH,UAAU,EAAE,CAAC,MAAe,EAAE,OAAY,EAAO,EAAE,CACjD,kBAAkB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;CAC/E,CAAC;AAEX,2EAA2E;AAC3E,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,GAAG,EAAE,aAAa;IAClB,iGAAiG;IACjG,eAAe,EAAE,CAAC,KAAc,EAAE,IAAS,EAAO,EAAE,CAClD,kBAAkB,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,YAAY,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;IAC5F,yFAAyF;IACzF,gBAAgB,EAAE,CAAC,KAAc,EAAE,IAAS,EAAO,EAAE,CACnD,kBAAkB,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;CACrF,CAAC"}
|
|
1
|
+
{"version":3,"file":"engine.js","sourceRoot":"","sources":["../../src/evm/engine.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF,EAAE;AACF,iGAAiG;AACjG,6FAA6F;AAC7F,0FAA0F;AAC1F,gGAAgG;AAChG,sBAAsB;AACtB,EAAE;AACF,kGAAkG;AAClG,gGAAgG;AAChG,oGAAoG;AACpG,6FAA6F;AAE7F,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAA0B,MAAM,MAAM,CAAC;AAE5E;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,QAAQ,CAAC;IAChC,sEAAsE;IACtE,kDAAkD;IAClD,yCAAyC;IACzC,2CAA2C;IAC3C,0CAA0C;CAC3C,CAAC,CAAC;AAEH,kGAAkG;AAClG,MAAM,CAAC,MAAM,aAAa,GAAG,QAAQ,CAAC;IACpC,uEAAuE;IACvE,yEAAyE;IACzE,gDAAgD;IAChD,0CAA0C;CAC3C,CAAC,CAAC;AAEH,4FAA4F;AAC5F,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,GAAG,EAAE,SAAS;IACd;;;;;;OAMG;IACH,UAAU,EAAE,CAAC,MAAe,EAAE,OAAY,EAAO,EAAE,CACjD,kBAAkB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;CAC/E,CAAC;AAEX,2EAA2E;AAC3E,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,GAAG,EAAE,aAAa;IAClB,iGAAiG;IACjG,eAAe,EAAE,CAAC,KAAc,EAAE,IAAS,EAAO,EAAE,CAClD,kBAAkB,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,YAAY,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;IAC5F,yFAAyF;IACzF,gBAAgB,EAAE,CAAC,KAAc,EAAE,IAAS,EAAO,EAAE,CACnD,kBAAkB,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;CACrF,CAAC"}
|
package/sdk/dist/index.d.ts
CHANGED
|
@@ -9,5 +9,6 @@ export * as token from "./token/index.js";
|
|
|
9
9
|
export * as contracts from "./descriptors/index.js";
|
|
10
10
|
export * as svmVenues from "./svm/accessors.js";
|
|
11
11
|
import "./routes/globals.js";
|
|
12
|
+
import "./routes/source-globals.generated.js";
|
|
12
13
|
export { installRouteGlobals, uninstallRouteGlobals, routeGlobals } from "./routes/globals.js";
|
|
13
14
|
//# sourceMappingURL=index.d.ts.map
|
package/sdk/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,OAAO,EACL,SAAS,EACT,WAAW,EACX,aAAa,EACb,sBAAsB,EACtB,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACpG,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC;AAC1C,OAAO,KAAK,SAAS,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,SAAS,MAAM,oBAAoB,CAAC;AAShD,OAAO,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,OAAO,EACL,SAAS,EACT,WAAW,EACX,aAAa,EACb,sBAAsB,EACtB,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACpG,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC;AAC1C,OAAO,KAAK,SAAS,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,SAAS,MAAM,oBAAoB,CAAC;AAShD,OAAO,qBAAqB,CAAC;AAE7B,OAAO,sCAAsC,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC"}
|
package/sdk/dist/index.js
CHANGED
|
@@ -17,5 +17,7 @@ export * as svmVenues from "./svm/accessors.js";
|
|
|
17
17
|
// revert together. See routes/globals.ts for the finer-grained escape hatches
|
|
18
18
|
// (a `globalThis.__ECO_ROUTES_NO_GLOBALS__` flag, `uninstallRouteGlobals()`).
|
|
19
19
|
import "./routes/globals.js";
|
|
20
|
+
// Compile-time names inside route bodies; this module installs no JavaScript values.
|
|
21
|
+
import "./routes/source-globals.generated.js";
|
|
20
22
|
export { installRouteGlobals, uninstallRouteGlobals, routeGlobals } from "./routes/globals.js";
|
|
21
23
|
//# sourceMappingURL=index.js.map
|
package/sdk/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,oEAAoE;AACpE,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,OAAO,EACL,SAAS,EACT,WAAW,EACX,aAAa,EACb,sBAAsB,EACtB,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACpG,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC;AAC1C,OAAO,KAAK,SAAS,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,SAAS,MAAM,oBAAoB,CAAC;AAEhD,mGAAmG;AACnG,kFAAkF;AAClF,8EAA8E;AAC9E,8EAA8E;AAC9E,8EAA8E;AAC9E,8EAA8E;AAC9E,8EAA8E;AAC9E,OAAO,qBAAqB,CAAC;AAC7B,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,oEAAoE;AACpE,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,OAAO,EACL,SAAS,EACT,WAAW,EACX,aAAa,EACb,sBAAsB,EACtB,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACpG,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC;AAC1C,OAAO,KAAK,SAAS,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,SAAS,MAAM,oBAAoB,CAAC;AAEhD,mGAAmG;AACnG,kFAAkF;AAClF,8EAA8E;AAC9E,8EAA8E;AAC9E,8EAA8E;AAC9E,8EAA8E;AAC9E,8EAA8E;AAC9E,OAAO,qBAAqB,CAAC;AAC7B,qFAAqF;AACrF,OAAO,sCAAsC,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC"}
|
|
@@ -1,54 +1,33 @@
|
|
|
1
1
|
import type { ContractDescriptor } from "../descriptors/types.js";
|
|
2
2
|
import { resolveTokenMap } from "../routes/token-registry.js";
|
|
3
3
|
/**
|
|
4
|
-
*
|
|
5
|
-
* compilers' loaders are meant to read (see
|
|
6
|
-
* `docs/plans/P5-plugin-skeleton-design.md`).
|
|
4
|
+
* Manifest for SDK route defaults and SauceScript operation-name metadata.
|
|
7
5
|
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
* • ambient MODULES (this `ambient` list, via `chainAmbient`) — whole SauceScript LIBRARY modules
|
|
12
|
-
* whose exported functions/consts are broadcast into every route with no `import` line.
|
|
6
|
+
* Ambient defines and ambient modules are separate inputs. `chainDefines()` resolves scalar
|
|
7
|
+
* chain, protocol, and token addresses. `chainAmbient()` supplies library module specifiers whose
|
|
8
|
+
* exports become available without imports.
|
|
13
9
|
*
|
|
14
|
-
*
|
|
15
|
-
*
|
|
16
|
-
*
|
|
17
|
-
*
|
|
18
|
-
* without merging this list in, so a direct `compileSauceRoute(..., {})` gets no ambient module.
|
|
19
|
-
* This is only safe because `rs-compile.ts` resolves `@sauce/token` to the SDK's OWN vendored copy
|
|
20
|
-
* (`SDK_STD_PACKAGES`, from `dist/std/token` when built) regardless of `baseDirs` — a specifier the
|
|
21
|
-
* compile can't resolve makes EVERY route throw `failed to import module "<name>"`, so an entry is
|
|
22
|
-
* not free to add: it must be resolvable on the route path first (an npm package a consumer may not
|
|
23
|
-
* have installed is exactly what this list must NOT name).
|
|
10
|
+
* The default ambient module is `@sauce/token`. `openRoute` merges this list with caller-supplied
|
|
11
|
+
* modules; direct `compileSauceRoute` uses only the caller's list. `rs-compile.ts` resolves the
|
|
12
|
+
* token module to the SDK's packaged `std/token` sources. New ambient modules must likewise be
|
|
13
|
+
* resolvable by the SDK because a missing module causes route compilation to fail.
|
|
24
14
|
*
|
|
25
|
-
*
|
|
26
|
-
*
|
|
27
|
-
* compiler feature — `token-rewrite.ts#rewriteTokenFactory` replaces the callee with `IERC20.at`
|
|
28
|
-
* before the compiler runs, so it never sees a method call on a call result (which its M1 subset
|
|
29
|
-
* does reject).
|
|
15
|
+
* The module exposes function forms such as `approve(token, spender, amount)`. Separately, SDK
|
|
16
|
+
* route rewriting lowers `Token(address).approve(...)` to an ERC-20 ABI binding.
|
|
30
17
|
*/
|
|
31
18
|
export interface SaucePlugin {
|
|
32
19
|
/** Ambient MODULE specifiers — library modules whose exports broadcast into every compile with no
|
|
33
20
|
* import line (distinct from the ambient DEFINES `chainDefines` threads in). */
|
|
34
21
|
ambient: string[];
|
|
35
|
-
/** SauceScript surface name -> the
|
|
22
|
+
/** SauceScript surface name -> the corresponding engine operation name. */
|
|
36
23
|
nameParity: Record<string, string>;
|
|
37
24
|
}
|
|
38
25
|
/** Load the plugin manifest. Cached after the first call. */
|
|
39
26
|
export declare function loadPlugin(): SaucePlugin;
|
|
40
27
|
/**
|
|
41
|
-
*
|
|
42
|
-
*
|
|
43
|
-
*
|
|
44
|
-
* already trusted before there was a "plugin" concept at all — `descriptors/registry.ts`'s
|
|
45
|
-
* `DESCRIPTORS` (protocol contract addresses) and `routes/token-registry.ts`'s `resolveTokenMap`
|
|
46
|
-
* (per-chain token symbol -> address, including its existing caller-override merge). NEITHER is
|
|
47
|
-
* copied or relocated: this is the SAME array/function reference, so a caller reading through
|
|
48
|
-
* `loadPluginData()` sees byte-identical data to reading `DESCRIPTORS`/`resolveTokenMap` directly.
|
|
49
|
-
* The point is a single point of entry, not a new data source — see `routes/ambient.ts#chainDefines`
|
|
50
|
-
* for the first (and, per the "keep this minimal, in-place" directive, currently only) caller
|
|
51
|
-
* routed through this accessor instead of importing those two registries itself.
|
|
28
|
+
* Combined access to the manifest and the registries used by route ambient resolution.
|
|
29
|
+
* `protocolAddresses` and `tokens` retain the original descriptor-array and resolver references;
|
|
30
|
+
* this view does not duplicate their data or change token override precedence.
|
|
52
31
|
*/
|
|
53
32
|
export interface SaucePluginData extends SaucePlugin {
|
|
54
33
|
/** `descriptors/registry.ts`'s `DESCRIPTORS`, re-exposed verbatim (same array reference). */
|
|
@@ -58,12 +37,8 @@ export interface SaucePluginData extends SaucePlugin {
|
|
|
58
37
|
}
|
|
59
38
|
export declare function loadPluginData(): SaucePluginData;
|
|
60
39
|
/**
|
|
61
|
-
*
|
|
62
|
-
*
|
|
63
|
-
* actually implements). Declared in the manifest since P7 but never consulted anywhere in the SDK
|
|
64
|
-
* until this function — exported so it is a live, tested part of the plugin surface rather than
|
|
65
|
-
* inert config; see `plugin.test.ts`. Returned `Readonly` because the underlying object IS the
|
|
66
|
-
* cached manifest's own map — a caller mutating this would corrupt every subsequent read.
|
|
40
|
+
* Read the manifest's SauceScript-to-engine operation mapping, currently `{ throw: "revert" }`.
|
|
41
|
+
* The readonly return type protects the cached manifest object from caller mutation at type level.
|
|
67
42
|
*/
|
|
68
43
|
export declare function pluginNameParity(): Readonly<Record<string, string>>;
|
|
69
44
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAa9D
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAa9D;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,WAAW;IAC1B;qFACiF;IACjF,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,2EAA2E;IAC3E,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC;AAOD,6DAA6D;AAC7D,wBAAgB,UAAU,IAAI,WAAW,CAKxC;AAED;;;;GAIG;AACH,MAAM,WAAW,eAAgB,SAAQ,WAAW;IAClD,6FAA6F;IAC7F,QAAQ,CAAC,iBAAiB,EAAE,SAAS,kBAAkB,EAAE,CAAC;IAC1D,8FAA8F;IAC9F,QAAQ,CAAC,MAAM,EAAE,OAAO,eAAe,CAAC;CACzC;AAQD,wBAAgB,cAAc,IAAI,eAAe,CAWhD;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAEnE"}
|
package/sdk/dist/plugin/index.js
CHANGED
|
@@ -42,12 +42,8 @@ export function loadPluginData() {
|
|
|
42
42
|
return cachedData;
|
|
43
43
|
}
|
|
44
44
|
/**
|
|
45
|
-
*
|
|
46
|
-
*
|
|
47
|
-
* actually implements). Declared in the manifest since P7 but never consulted anywhere in the SDK
|
|
48
|
-
* until this function — exported so it is a live, tested part of the plugin surface rather than
|
|
49
|
-
* inert config; see `plugin.test.ts`. Returned `Readonly` because the underlying object IS the
|
|
50
|
-
* cached manifest's own map — a caller mutating this would corrupt every subsequent read.
|
|
45
|
+
* Read the manifest's SauceScript-to-engine operation mapping, currently `{ throw: "revert" }`.
|
|
46
|
+
* The readonly return type protects the cached manifest object from caller mutation at type level.
|
|
51
47
|
*/
|
|
52
48
|
export function pluginNameParity() {
|
|
53
49
|
return loadPluginData().nameParity;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,2FAA2F;AAC3F,sCAAsC;AACtC,yFAAyF;AACzF,0FAA0F;AAC1F,2FAA2F;AAC3F,oEAAoE;AACpE,sFAAsF;AACtF,uFAAuF;AACvF,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACxD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,2FAA2F;AAC3F,sCAAsC;AACtC,yFAAyF;AACzF,0FAA0F;AAC1F,2FAA2F;AAC3F,oEAAoE;AACpE,sFAAsF;AACtF,uFAAuF;AACvF,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACxD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;AAyBpD,+FAA+F;AAC/F,yFAAyF;AACzF,6CAA6C;AAC7C,IAAI,MAA+B,CAAC;AAEpC,6DAA6D;AAC7D,MAAM,UAAU,UAAU;IACxB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAgB,CAAC;IAC1E,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAcD,2FAA2F;AAC3F,6FAA6F;AAC7F,8FAA8F;AAC9F,0FAA0F;AAC1F,IAAI,UAAuC,CAAC;AAE5C,MAAM,UAAU,cAAc;IAC5B,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;QAC5B,UAAU,GAAG;YACX,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,iBAAiB,EAAE,WAAW;YAC9B,MAAM,EAAE,eAAe;SACxB,CAAC;IACJ,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB;IAC9B,OAAO,cAAc,EAAE,CAAC,UAAU,CAAC;AACrC,CAAC"}
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
* ? new TextEncoder().encode(settleSource())
|
|
25
25
|
* : readFrom(SAUCE_BASE_DIRS, path), // serves the program's `./artifacts/IERC20.json`
|
|
26
26
|
* });
|
|
27
|
-
* // bytecode --
|
|
27
|
+
* // bytecode -- 356 bytes, keccak256 === SETTLE_WIRE.PROGRAM_HASH, for every caller and every value
|
|
28
28
|
* ```
|
|
29
29
|
*
|
|
30
30
|
* Those three compile inputs are the whole contract — change any of them and the bytes change. They are
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
*
|
|
36
36
|
* THE VALUES RIDE THE PAYLOAD, NOT THE PROGRAM. `(tokens, minOut, recipient)` are appended after the
|
|
37
37
|
* program as 32-byte big-endian words — `[program | tokensPtr | minOut | recipient | count | token…]`
|
|
38
|
-
* — and read back through CALLDATA. That is why one
|
|
38
|
+
* — and read back through CALLDATA. That is why one 356-byte blob serves every argument set, and why
|
|
39
39
|
* `@eco-incorp/sauce/verify` can answer "is this the audited settle, and what will it do?" from
|
|
40
40
|
* the bytes alone with `viem` as its only dependency. `@eco-incorp/sauce/verify`'s
|
|
41
41
|
* `encodeSettleProgram` builds the tail; its `validateSettleProgram` reads it back and checks the
|
|
@@ -35,7 +35,7 @@ import { IERC20 } from "./artifacts/IERC20.json";
|
|
|
35
35
|
// THE COMPILED PROGRAM IS A FUNCTION OF THIS FILE AND THE COMPILER PIN ONLY — never of the
|
|
36
36
|
// arguments. `main`'s three parameters below are RUNTIME ENTRY ARGUMENTS: the caller appends them
|
|
37
37
|
// to the compiled program as 32-byte words and the program reads them back through CALLDATA, so no
|
|
38
|
-
// value a caller picks is visible to the compiler at all. One
|
|
38
|
+
// value a caller picks is visible to the compiler at all. One 356-byte blob therefore serves every
|
|
39
39
|
// token list, floor and recipient, which is what lets `sdk/src/verify/` pin a single
|
|
40
40
|
// `keccak256(program)` and still report per-payload params.
|
|
41
41
|
//
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
* `../chains/canonical.js`, each BOTH callable and a namespace.
|
|
4
4
|
*
|
|
5
5
|
* ```ts
|
|
6
|
-
* import {
|
|
7
|
-
* const { Base, Solana } = chainAccessors;
|
|
8
|
-
* const built = Base("return 1n;", { pot, deadline, portal }).reward({ source: Solana.chain, creator, prover, deadline });
|
|
6
|
+
* import { routes } from "@eco-incorp/sauce";
|
|
7
|
+
* const { Base, Solana } = routes.chainAccessors;
|
|
8
|
+
* const built = Base("return 1n;", { pot, engine, deadline, portal }).reward({ source: Solana.chain, creator, prover, deadline });
|
|
9
9
|
* // identically: Base.route("return 1n;", {...}).reward({...})
|
|
10
10
|
* ```
|
|
11
11
|
*/
|
package/sdk/dist/routes/index.js
CHANGED
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
* `../chains/canonical.js`, each BOTH callable and a namespace.
|
|
4
4
|
*
|
|
5
5
|
* ```ts
|
|
6
|
-
* import {
|
|
7
|
-
* const { Base, Solana } = chainAccessors;
|
|
8
|
-
* const built = Base("return 1n;", { pot, deadline, portal }).reward({ source: Solana.chain, creator, prover, deadline });
|
|
6
|
+
* import { routes } from "@eco-incorp/sauce";
|
|
7
|
+
* const { Base, Solana } = routes.chainAccessors;
|
|
8
|
+
* const built = Base("return 1n;", { pot, engine, deadline, portal }).reward({ source: Solana.chain, creator, prover, deadline });
|
|
9
9
|
* // identically: Base.route("return 1n;", {...}).reward({...})
|
|
10
10
|
* ```
|
|
11
11
|
*/
|
|
@@ -32,15 +32,8 @@ export type { NestVia };
|
|
|
32
32
|
* defines) or the compile fails closed with "`X` is not a declared variable".
|
|
33
33
|
*/
|
|
34
34
|
export type { SauceBody };
|
|
35
|
-
/**
|
|
36
|
-
|
|
37
|
-
/** The destination-chain execution seam — required, unless `.pot` (EVM shorthand) is supplied instead. */
|
|
38
|
-
execution?: SauceEvmExecutionInput | SauceSvmExecutionInput;
|
|
39
|
-
/** EVM shorthand for `execution: { pot }` — mutually redundant with `execution`, never both meaningfully differ. */
|
|
40
|
-
pot?: AddressInput;
|
|
41
|
-
/** The interpreter the cook runs on, required whenever `pot` is used as the shorthand. Never
|
|
42
|
-
* defaulted, for the reason `SauceEvmExecutionInput.engine` gives. */
|
|
43
|
-
engine?: AddressInput;
|
|
35
|
+
/** Route and reward options shared by the EVM and SVM execution forms. */
|
|
36
|
+
interface IntentOptionsCommon {
|
|
44
37
|
compile?: SauceCompileOptions;
|
|
45
38
|
/** Scalar ambient defines threaded into `compile()`, underneath the chain-scoped ones (see `ambient.ts`). */
|
|
46
39
|
defines?: Record<string, bigint | boolean | number>;
|
|
@@ -66,6 +59,23 @@ export interface IntentOptions {
|
|
|
66
59
|
* every submission/read helper on `BuiltIntent` below. */
|
|
67
60
|
sourcePortal?: AddressInput;
|
|
68
61
|
}
|
|
62
|
+
/**
|
|
63
|
+
* Everything a route needs beyond the Sauce program body itself. Supply an explicit destination
|
|
64
|
+
* execution, or both `pot` and `engine` as the EVM shorthand. When `execution` is supplied it takes
|
|
65
|
+
* precedence over any redundant shorthand fields, matching `openRoute`'s runtime behavior.
|
|
66
|
+
*/
|
|
67
|
+
export type IntentOptions = IntentOptionsCommon & ({
|
|
68
|
+
/** The destination-chain execution seam; takes precedence over the EVM shorthand. */
|
|
69
|
+
execution: SauceEvmExecutionInput | SauceSvmExecutionInput;
|
|
70
|
+
pot?: AddressInput;
|
|
71
|
+
engine?: AddressInput;
|
|
72
|
+
} | {
|
|
73
|
+
execution?: undefined;
|
|
74
|
+
/** EVM shorthand for `execution: { pot, engine }`. */
|
|
75
|
+
pot: AddressInput;
|
|
76
|
+
/** The interpreter the cook runs on. Never defaulted; see `SauceEvmExecutionInput.engine`. */
|
|
77
|
+
engine: AddressInput;
|
|
78
|
+
});
|
|
69
79
|
/** The object form of a reward argument — every field optional, since a missing one falls back to
|
|
70
80
|
* the matching `IntentOptions` field (and a STILL-missing required field throws, naming exactly
|
|
71
81
|
* which one). */
|
|
@@ -180,11 +190,14 @@ export interface NestOptions {
|
|
|
180
190
|
/** `"skip"` omits the native leg even when the child declares `reward.nativeAmount > 0`. Default
|
|
181
191
|
* `"balance"`. */
|
|
182
192
|
native?: "balance" | "skip";
|
|
183
|
-
/**
|
|
193
|
+
/** Adds `child.reward.nativeAmount` to the transfer cook's fee, so solver-delivered
|
|
184
194
|
* native funding (via this route's own `route.nativeAmount`) reaches the Pot before the transfer
|
|
185
195
|
* reads `ctx.selfBalance()`. Default `false`. Re-enables a NATIVE-only coverage check (T5): the sum
|
|
186
196
|
* of every opted-in child's `nativeAmount` must not exceed this route's own `route.nativeAmount`. */
|
|
187
197
|
fundNativeFromRoute?: boolean;
|
|
198
|
+
/** Current Kitchen fee in wei, paid once per merged transfer cook. Defaults to zero; read the
|
|
199
|
+
* destination Kitchen's executionFee before building for a priced deployment. */
|
|
200
|
+
executionFee?: bigint | number | string;
|
|
188
201
|
/** Overrides the Pot the transfer `cook()` executes on. Defaults to this route's own EVM
|
|
189
202
|
* `execution.pot` (T3: required for `via: "transfer"` — a Solana/SVM destination has no Pot). */
|
|
190
203
|
pot?: AddressInput;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"intent-dsl.d.ts","sourceRoot":"","sources":["../../src/routes/intent-dsl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAGvE,OAAO,EAAqC,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAQjF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAKL,KAAK,OAAO,EAEb,MAAM,WAAW,CAAC;AAEnB,OAAO,EAQL,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACd,MAAM,aAAa,CAAC;AACrB,OAAO,EAGL,KAAK,mBAAmB,EACxB,KAAK,sBAAsB,EAC3B,KAAK,sBAAsB,EAC5B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,YAAY,CAAC;AACnE,OAAO,KAAK,EACV,YAAY,EACZ,SAAS,EACT,GAAG,EACH,MAAM,EAGN,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAEpB,YAAY,EAAE,OAAO,EAAE,CAAC;AAExB;;;;;;GAMG;AACH,YAAY,EAAE,SAAS,EAAE,CAAC;AAE1B,
|
|
1
|
+
{"version":3,"file":"intent-dsl.d.ts","sourceRoot":"","sources":["../../src/routes/intent-dsl.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { isSauceClosure, sauceBodyToSource } from "./closure.js";
|
|
|
4
4
|
import { encodeRewardEvm, encodeRewardSvm, encodeRouteEvm, encodeRouteSvm, hashIntent, } from "./encode.js";
|
|
5
5
|
import { assembleIntent } from "./intent.js";
|
|
6
6
|
import { assertNestingInvariants, nestedChildCalls, nestedTransferProgram, } from "./nest.js";
|
|
7
|
-
import { normalizeRoute } from "./normalize.js";
|
|
7
|
+
import { normalizeRoute, toBigInt } from "./normalize.js";
|
|
8
8
|
import { approvalTxs, fundTx, intentHashCall, intentVaultAddressCall, isIntentFundedCall, publishAndFundTx, publishTx, } from "./portal.js";
|
|
9
9
|
import { compileSauceRoute, } from "./sauce-route.js";
|
|
10
10
|
import { predictVaultAddress } from "./vault.js";
|
|
@@ -188,6 +188,7 @@ export function openRoute(chain, sauce, options) {
|
|
|
188
188
|
"requireCap",
|
|
189
189
|
"native",
|
|
190
190
|
"fundNativeFromRoute",
|
|
191
|
+
"executionFee",
|
|
191
192
|
"pot",
|
|
192
193
|
"engine",
|
|
193
194
|
"compile",
|
|
@@ -241,6 +242,7 @@ export function openRoute(chain, sauce, options) {
|
|
|
241
242
|
requireCap: opts?.requireCap ?? false,
|
|
242
243
|
native: opts?.native ?? "balance",
|
|
243
244
|
fundNativeFromRoute: opts?.fundNativeFromRoute ?? false,
|
|
245
|
+
executionFee: toBigInt(opts?.executionFee ?? 0n),
|
|
244
246
|
pot: opts?.pot,
|
|
245
247
|
engine: opts?.engine,
|
|
246
248
|
compile: opts?.compile,
|
|
@@ -298,6 +300,7 @@ export function openRoute(chain, sauce, options) {
|
|
|
298
300
|
/** Compiles every `via: "transfer"` entry in one position group into ONE merged `cook()`
|
|
299
301
|
* call (in `.nest()` order) — see `nest.ts#nestedTransferProgram`. */
|
|
300
302
|
function buildTransferCall(transferEntries) {
|
|
303
|
+
const executionFee = transferEntries[0].executionFee;
|
|
301
304
|
const defaultPot = evmPotOf(execution);
|
|
302
305
|
const pot = transferEntries[0].pot ?? defaultPot;
|
|
303
306
|
if (pot === undefined) {
|
|
@@ -315,6 +318,10 @@ export function openRoute(chain, sauce, options) {
|
|
|
315
318
|
// would silently run entry 1's bytecode on entry 0's interpreter, which is the one thing a
|
|
316
319
|
// caller cannot see in the encoded call.
|
|
317
320
|
for (const e of transferEntries) {
|
|
321
|
+
if (e.executionFee !== executionFee) {
|
|
322
|
+
throw new Error("openRoute: .nest() transfer children merged into the same position group must " +
|
|
323
|
+
"specify the same executionFee");
|
|
324
|
+
}
|
|
318
325
|
const entryPot = e.pot ?? defaultPot;
|
|
319
326
|
if (entryPot !== pot) {
|
|
320
327
|
throw new Error(`openRoute: .nest() via: "transfer" children merged into the same position group must ` +
|
|
@@ -339,7 +346,7 @@ export function openRoute(chain, sauce, options) {
|
|
|
339
346
|
const { source: transferSource, baseDirs } = nestedTransferProgram(entries);
|
|
340
347
|
const nativeValue = transferEntries
|
|
341
348
|
.filter((e) => e.fundNativeFromRoute)
|
|
342
|
-
.reduce((sum, e) => sum + e.built.intent.reward.nativeAmount,
|
|
349
|
+
.reduce((sum, e) => sum + e.built.intent.reward.nativeAmount, executionFee);
|
|
343
350
|
const perEntryCompile = transferEntries.map((e) => e.compile).find((c) => c !== undefined);
|
|
344
351
|
const transferCompileOptions = {
|
|
345
352
|
...perEntryCompile,
|
|
@@ -364,6 +371,16 @@ export function openRoute(chain, sauce, options) {
|
|
|
364
371
|
...compiledRoute.calls,
|
|
365
372
|
...childCalls("after"),
|
|
366
373
|
];
|
|
374
|
+
if (nestedEntries.some((entry) => entry.executionFee > 0n)) {
|
|
375
|
+
const fundedByBodyNative = nestedEntries
|
|
376
|
+
.filter((entry) => entry.via === "publishAndFund" && entry.fundedByBody)
|
|
377
|
+
.reduce((sum, entry) => sum + entry.built.intent.reward.nativeAmount, 0n);
|
|
378
|
+
const requiredNative = calls.reduce((sum, call) => sum + toBigInt(call.value ?? 0n), 0n) - fundedByBodyNative;
|
|
379
|
+
if (requiredNative > toBigInt(options.nativeAmount ?? 0n)) {
|
|
380
|
+
throw new Error(`openRoute: route.nativeAmount must cover ${requiredNative} wei for its calls, ` +
|
|
381
|
+
"including each cook's execution fee and forwarded child rewards");
|
|
382
|
+
}
|
|
383
|
+
}
|
|
367
384
|
const intent = assembleIntent(source, destination, {
|
|
368
385
|
salt: options.salt,
|
|
369
386
|
deadline: options.deadline,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"intent-dsl.js","sourceRoot":"","sources":["../../src/routes/intent-dsl.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"intent-dsl.js","sourceRoot":"","sources":["../../src/routes/intent-dsl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,26 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* eco-routes V2 STATIC nesting — the cross-chain cascade, pure and DSL-free.
|
|
3
|
+
*
|
|
4
|
+
* A STATIC child (every reward field known off-chain) needs no on-chain struct construction and no
|
|
5
|
+
* Sauce-program involvement at all: its `publishAndFund` is a fully pre-encoded `Call`
|
|
6
|
+
* (`portal.ts#publishAndFundTx`) appended to the PARENT's own `route.calls`. This module produces
|
|
7
|
+
* exactly those calls and the build-time invariants that keep a cascade honest — see the design
|
|
8
|
+
* doc's §15 for the full grounding; the load-bearing facts are restated inline below.
|
|
9
|
+
*
|
|
10
|
+
* `P` (the target Portal for `nestedChildCalls`) is always the PARENT's own `route.portal` — not new
|
|
11
|
+
* configuration. The child's source chain IS the parent's destination chain (its execution chain), so
|
|
12
|
+
* the Portal the child publishes on is the Portal on the chain the parent executes on, and
|
|
13
|
+
* `Inbox._fulfill` already requires `route.portal == address(this)`.
|
|
14
|
+
*
|
|
15
|
+
* WHY THE APPROVE IS FROM THE EXECUTOR TO THE PORTAL (`Inbox._fulfill`/`Executor.execute`, verbatim):
|
|
16
|
+
* `_fulfill` `safeTransferFrom`s every `route.tokens` entry from the solver to `address(executor)`,
|
|
17
|
+
* then calls `executor.execute{value: route.nativeAmount}(route.calls)`; `Executor.execute` does a
|
|
18
|
+
* plain `call.target.call{value}(call.data)` per entry (`onlyPortal`). So `msg.sender` for EVERY
|
|
19
|
+
* `route.calls` entry — including a spliced child `approve`/`publishAndFund` — is the EXECUTOR, which
|
|
20
|
+
* is also what holds `route.tokens`/`route.nativeAmount`. `IntentSource._fundToken` reads
|
|
21
|
+
* `token.allowance(funder = msg.sender, address(this) = Portal)`, so the approve must be issued FROM
|
|
22
|
+
* the Executor TO the Portal — exactly what an `approve` `route.calls` entry is.
|
|
23
|
+
*/
|
|
1
24
|
import type { CanonicalChain } from "../chains/canonical.js";
|
|
2
25
|
import { type VaultConfig } from "./vault.js";
|
|
3
26
|
import type { AddressInput, CallInput, Intent, Route } from "./types.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nest.d.ts","sourceRoot":"","sources":["../../src/routes/nest.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"nest.d.ts","sourceRoot":"","sources":["../../src/routes/nest.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAO7D,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,YAAY,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAoB,MAAM,YAAY,CAAC;AAE3F,qGAAqG;AACrG,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;CAChC;AAMD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,GAAG,SAAS,SAAS,EAAE,CAK9F;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAEtD;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,OAAO,GAAG,UAAU,GAAG,gBAAgB,CAAC;AAEpD,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB;;;;oFAIgF;IAChF,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,8FAA8F;IAC9F,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;8FAC8F;AAC9F,MAAM,MAAM,oBAAoB,GAC5B;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAA;CAAE,GAC3D;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAA;CAAE,GAC5D;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAA;CAAE,CAAC;AAEhE,wDAAwD;AACxD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,eAAe,EAAE,oBAAoB,CAAC;IAC/C;uGACmG;IACnG,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB;6EACyE;IACzE,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC;IAC9B;iGAC6F;IAC7F,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;CACtC;AAED,MAAM,WAAW,2BAA2B;IAC1C;wBACoB;IACpB,QAAQ,CAAC,WAAW,EAAE,cAAc,CAAC;IACrC;qDACiD;IACjD,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,SAAS,SAAS,EAAE,CAAC;CACzC;AAMD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,2BAA2B,GAAG,IAAI,CAmG/E;AA2DD;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,oBAAoB,GACzB,SAAS,MAAM,EAAE,CA6DnB;AAED;0CAC0C;AAC1C,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC;CACrC;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,SAAS,iBAAiB,EAAE,GAAG;IAC5E,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;CACtC,CAOA"}
|
package/sdk/dist/routes/nest.js
CHANGED
|
@@ -21,7 +21,6 @@
|
|
|
21
21
|
* `token.allowance(funder = msg.sender, address(this) = Portal)`, so the approve must be issued FROM
|
|
22
22
|
* the Executor TO the Portal — exactly what an `approve` `route.calls` entry is.
|
|
23
23
|
*/
|
|
24
|
-
import { hexToBytes } from "viem";
|
|
25
24
|
import { formatAddressField, formatBigint } from "../deposit/format.js";
|
|
26
25
|
import { toAddressBigint } from "../token/params.js";
|
|
27
26
|
import { ERC20_IMPORT_LINE } from "../token/evm.js";
|
|
@@ -181,9 +180,8 @@ function vaultAddressStatement(child, index, resolution) {
|
|
|
181
180
|
case "runtime": {
|
|
182
181
|
const portalLit = formatAddressField(toAddressBigint(resolution.portal, "portal"));
|
|
183
182
|
const calldata = intentVaultAddressCall(child, { portal: resolution.portal }).data;
|
|
184
|
-
const
|
|
185
|
-
|
|
186
|
-
expr = `abi.decode(contract.static(${portalLit}, ${bytesLit}), "address")`;
|
|
183
|
+
const bytesLit = `hex\`${calldata.slice(2)}\``;
|
|
184
|
+
expr = `abi.decode(evm.static(${portalLit}, ${bytesLit}), ["Address"])[0]`;
|
|
187
185
|
break;
|
|
188
186
|
}
|
|
189
187
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nest.js","sourceRoot":"","sources":["../../src/routes/nest.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;
|
|
1
|
+
{"version":3,"file":"nest.js","sourceRoot":"","sources":["../../src/routes/nest.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,8 +31,8 @@ export interface ProtocolRewriteResult {
|
|
|
31
31
|
/**
|
|
32
32
|
* Rewrites every recognized protocol-accessor call site (shapes A-D) and, unless
|
|
33
33
|
* `opts.selfSugar === false`, every bare `self` read, over `source` for the enclosing/destination
|
|
34
|
-
* `chain`.
|
|
35
|
-
*
|
|
34
|
+
* `chain`. Edits use ranges from acorn over the original source, preserving unrelated formatting,
|
|
35
|
+
* comments, and code byte-for-byte.
|
|
36
36
|
*/
|
|
37
37
|
export declare function rewriteProtocolAccessors(source: string, chain: CanonicalChain, opts?: ProtocolRewriteOptions): ProtocolRewriteResult;
|
|
38
38
|
//# sourceMappingURL=protocol-rewrite.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocol-rewrite.d.ts","sourceRoot":"","sources":["../../src/routes/protocol-rewrite.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"protocol-rewrite.d.ts","sourceRoot":"","sources":["../../src/routes/protocol-rewrite.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EAAgB,KAAK,cAAc,EAAE,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAQ1F,MAAM,WAAW,sBAAsB;IACrC;;;gDAG4C;IAC5C,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;6FACyF;IACzF,UAAU,CAAC,EAAE,SAAS,QAAQ,EAAE,CAAC;IACjC,6EAA6E;IAC7E,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;iFAC6E;IAC7E,iBAAiB,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,kEAAkE;IAClE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,gGAAgG;IAChG,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IACpC,+FAA+F;IAC/F,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,4CAA4C;IAC5C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,iGAAiG;IACjG,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;CACnC;AA8YD;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,cAAc,EACrB,IAAI,GAAE,sBAA2B,GAChC,qBAAqB,CA4FvB"}
|