mppx 0.8.3 → 0.8.5
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/CHANGELOG.md +14 -0
- package/dist/cli/cli.d.ts.map +1 -1
- package/dist/cli/cli.js +2 -0
- package/dist/cli/cli.js.map +1 -1
- package/dist/cli/plugins/stripe.d.ts.map +1 -1
- package/dist/cli/plugins/stripe.js +32 -12
- package/dist/cli/plugins/stripe.js.map +1 -1
- package/dist/cli/utils.d.ts.map +1 -1
- package/dist/cli/utils.js +1 -1
- package/dist/cli/utils.js.map +1 -1
- package/dist/cli/validate/challenge.d.ts +14 -0
- package/dist/cli/validate/challenge.d.ts.map +1 -0
- package/dist/cli/validate/challenge.js +211 -0
- package/dist/cli/validate/challenge.js.map +1 -0
- package/dist/cli/validate/discovery.d.ts +10 -0
- package/dist/cli/validate/discovery.d.ts.map +1 -0
- package/dist/cli/validate/discovery.js +128 -0
- package/dist/cli/validate/discovery.js.map +1 -0
- package/dist/cli/validate/helpers.d.ts +33 -0
- package/dist/cli/validate/helpers.d.ts.map +1 -0
- package/dist/cli/validate/helpers.js +136 -0
- package/dist/cli/validate/helpers.js.map +1 -0
- package/dist/cli/validate/index.d.ts +17 -0
- package/dist/cli/validate/index.d.ts.map +1 -0
- package/dist/cli/validate/index.js +224 -0
- package/dist/cli/validate/index.js.map +1 -0
- package/dist/cli/validate/payment.d.ts +7 -0
- package/dist/cli/validate/payment.d.ts.map +1 -0
- package/dist/cli/validate/payment.js +381 -0
- package/dist/cli/validate/payment.js.map +1 -0
- package/dist/evm/client/Charge.d.ts +2 -2
- package/dist/evm/client/Charge.d.ts.map +1 -1
- package/dist/evm/client/Charge.js +11 -17
- package/dist/evm/client/Charge.js.map +1 -1
- package/dist/evm/server/Charge.d.ts +5 -5
- package/dist/evm/server/Charge.d.ts.map +1 -1
- package/dist/evm/server/Charge.js +15 -7
- package/dist/evm/server/Charge.js.map +1 -1
- package/dist/tempo/internal/auto-swap.d.ts.map +1 -1
- package/dist/tempo/internal/auto-swap.js +6 -1
- package/dist/tempo/internal/auto-swap.js.map +1 -1
- package/dist/tempo/server/internal/html.gen.d.ts +1 -1
- package/dist/tempo/server/internal/html.gen.d.ts.map +1 -1
- package/dist/tempo/server/internal/html.gen.js +1 -1
- package/dist/tempo/server/internal/html.gen.js.map +1 -1
- package/dist/x402/Assets.d.ts +40 -0
- package/dist/x402/Assets.d.ts.map +1 -1
- package/dist/x402/Assets.js +73 -0
- package/dist/x402/Assets.js.map +1 -1
- package/dist/x402/client/Exact.d.ts +2 -2
- package/dist/x402/client/Exact.d.ts.map +1 -1
- package/dist/x402/client/Exact.js +6 -13
- package/dist/x402/client/Exact.js.map +1 -1
- package/package.json +1 -1
- package/src/cli/cli.test.ts +134 -29
- package/src/cli/cli.ts +2 -0
- package/src/cli/mcp.test.ts +1 -0
- package/src/cli/plugins/stripe.ts +31 -12
- package/src/cli/utils.test.ts +36 -2
- package/src/cli/utils.ts +2 -1
- package/src/cli/validate/challenge.ts +335 -0
- package/src/cli/validate/discovery.ts +120 -0
- package/src/cli/validate/helpers.ts +154 -0
- package/src/cli/validate/index.ts +348 -0
- package/src/cli/validate/payment.ts +488 -0
- package/src/cli/validate.test.ts +539 -0
- package/src/evm/PublicInterface.test-d.ts +15 -2
- package/src/evm/client/Charge.test.ts +248 -0
- package/src/evm/client/Charge.ts +12 -23
- package/src/evm/server/Charge.test.ts +140 -0
- package/src/evm/server/Charge.ts +19 -12
- package/src/tempo/internal/auto-swap.test.ts +26 -9
- package/src/tempo/internal/auto-swap.ts +15 -2
- package/src/tempo/server/internal/html.gen.ts +1 -1
- package/src/x402/Assets.test.ts +211 -0
- package/src/x402/Assets.ts +116 -0
- package/src/x402/client/Exact.test.ts +129 -0
- package/src/x402/client/Exact.ts +7 -19
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"payment.js","sourceRoot":"","sources":["../../../src/cli/validate/payment.ts"],"names":[],"mappings":"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"}
|
|
@@ -94,9 +94,9 @@ export declare namespace charge {
|
|
|
94
94
|
/** Optional allowlist of supported EVM chain IDs. */
|
|
95
95
|
networks?: readonly number[] | undefined;
|
|
96
96
|
/** Optional allowlist of supported currencies. */
|
|
97
|
-
currencies?: readonly
|
|
97
|
+
currencies?: readonly Assets.Currency[] | undefined;
|
|
98
98
|
/** Legacy alias for `currencies`. */
|
|
99
|
-
assets?: readonly
|
|
99
|
+
assets?: readonly Assets.Currency[] | undefined;
|
|
100
100
|
};
|
|
101
101
|
}
|
|
102
102
|
//# sourceMappingURL=Charge.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Charge.d.ts","sourceRoot":"","sources":["../../../src/evm/client/Charge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAInC,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AAGzC,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AAEtC,OAAO,KAAK,KAAK,MAAM,aAAa,CAAA;AAEpC;;;;;GAKG;AACH,wBAAgB,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAqEnD;AAED,MAAM,CAAC,OAAO,WAAW,MAAM,CAAC;IAC9B,KAAK,MAAM,GAAG,OAAO,GAAG;QACtB,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,KAAK,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC,CAAA;KAC5D,CAAA;IAED,KAAK,UAAU,GAAG;QAChB,mDAAmD;QACnD,OAAO,EAAE,OAAO,CAAA;QAChB,4DAA4D;QAC5D,aAAa,CAAC,EAAE,KAAK,CAAC,mBAAmB,GAAG,SAAS,CAAA;QACrD,gGAAgG;QAChG,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QAC7B,yEAAyE;QACzE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QAC9B,mEAAmE;QACnE,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QACpC,qDAAqD;QACrD,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAA;QACxC,kDAAkD;QAClD,UAAU,CAAC,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"Charge.d.ts","sourceRoot":"","sources":["../../../src/evm/client/Charge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAInC,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AAGzC,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AAEtC,OAAO,KAAK,KAAK,MAAM,aAAa,CAAA;AAEpC;;;;;GAKG;AACH,wBAAgB,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAqEnD;AAED,MAAM,CAAC,OAAO,WAAW,MAAM,CAAC;IAC9B,KAAK,MAAM,GAAG,OAAO,GAAG;QACtB,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,KAAK,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC,CAAA;KAC5D,CAAA;IAED,KAAK,UAAU,GAAG;QAChB,mDAAmD;QACnD,OAAO,EAAE,OAAO,CAAA;QAChB,4DAA4D;QAC5D,aAAa,CAAC,EAAE,KAAK,CAAC,mBAAmB,GAAG,SAAS,CAAA;QACrD,gGAAgG;QAChG,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QAC7B,yEAAyE;QACzE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QAC9B,mEAAmE;QACnE,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QACpC,qDAAqD;QACrD,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAA;QACxC,kDAAkD;QAClD,UAAU,CAAC,EAAE,SAAS,MAAM,CAAC,QAAQ,EAAE,GAAG,SAAS,CAAA;QACnD,qCAAqC;QACrC,MAAM,CAAC,EAAE,SAAS,MAAM,CAAC,QAAQ,EAAE,GAAG,SAAS,CAAA;KAChD,CAAA;CACF"}
|
|
@@ -88,11 +88,11 @@ function assertPolicy(parameters, request) {
|
|
|
88
88
|
if (parameters.networks && !parameters.networks.includes(chainId))
|
|
89
89
|
throw new Error(`EVM chain ID is not allowed: ${chainId}.`);
|
|
90
90
|
const currencies = parameters.currencies ?? parameters.assets;
|
|
91
|
-
if (currencies?.some((currency) =>
|
|
91
|
+
if (currencies?.some((currency) => Assets.isRawAddress(currency)) && !parameters.networks?.length)
|
|
92
92
|
throw new Error('EVM raw currency allowlists require networks.');
|
|
93
93
|
if (currencies) {
|
|
94
94
|
const acceptedCurrency = getAddress(request.currency);
|
|
95
|
-
const allowed = currencies.some((currency) =>
|
|
95
|
+
const allowed = currencies.some((currency) => Assets.matches(currency, acceptedCurrency, network));
|
|
96
96
|
if (!allowed)
|
|
97
97
|
throw new Error(`EVM currency is not allowed: ${acceptedCurrency}.`);
|
|
98
98
|
}
|
|
@@ -111,31 +111,25 @@ function resolveAuthorization(parameters, request) {
|
|
|
111
111
|
const currencies = parameters.currencies ?? parameters.assets;
|
|
112
112
|
const acceptedCurrency = getAddress(request.currency);
|
|
113
113
|
const network = Types.networkOf(request.methodDetails.chainId);
|
|
114
|
-
const currency = currencies?.find((currency) =>
|
|
115
|
-
|
|
114
|
+
const currency = currencies?.find((currency) => Assets.matches(currency, acceptedCurrency, network));
|
|
115
|
+
const resolved = currency ? Assets.resolve(currency, network) : undefined;
|
|
116
|
+
if (resolved?.transfer?.type === Types.eip3009)
|
|
116
117
|
return {
|
|
117
|
-
name:
|
|
118
|
-
version:
|
|
118
|
+
name: resolved.transfer.name,
|
|
119
|
+
version: resolved.transfer.version,
|
|
119
120
|
};
|
|
120
121
|
if (parameters.authorization)
|
|
121
122
|
return parameters.authorization;
|
|
122
123
|
throw new Error('EVM authorization requires token name and version.');
|
|
123
124
|
}
|
|
124
|
-
function addressOf(currency) {
|
|
125
|
-
return Assets.isAsset(currency) ? currency.address : currency;
|
|
126
|
-
}
|
|
127
|
-
function currencyMatches(currency, acceptedCurrency, network) {
|
|
128
|
-
if (getAddress(addressOf(currency)) !== acceptedCurrency)
|
|
129
|
-
return false;
|
|
130
|
-
return !Assets.isAsset(currency) || currency.network === network;
|
|
131
|
-
}
|
|
132
125
|
function decimalsOfAcceptedCurrency(parameters, request) {
|
|
133
126
|
const currencies = parameters.currencies ?? parameters.assets;
|
|
134
127
|
const acceptedCurrency = getAddress(request.currency);
|
|
135
128
|
const network = Types.networkOf(request.methodDetails.chainId);
|
|
136
|
-
const currency = currencies?.find((currency) =>
|
|
137
|
-
|
|
138
|
-
|
|
129
|
+
const currency = currencies?.find((currency) => Assets.matches(currency, acceptedCurrency, network));
|
|
130
|
+
const resolved = currency ? Assets.resolve(currency, network) : undefined;
|
|
131
|
+
if (resolved?.decimals !== undefined)
|
|
132
|
+
return resolved.decimals;
|
|
139
133
|
return parameters.decimals;
|
|
140
134
|
}
|
|
141
135
|
//# sourceMappingURL=Charge.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Charge.js","sourceRoot":"","sources":["../../../src/evm/client/Charge.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AAE7C,OAAO,KAAK,UAAU,MAAM,qBAAqB,CAAA;AACjD,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAA;AACxD,OAAO,KAAK,mBAAmB,MAAM,uCAAuC,CAAA;AAC5E,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AACtC,OAAO,KAAK,OAAO,MAAM,eAAe,CAAA;AACxC,OAAO,KAAK,KAAK,MAAM,aAAa,CAAA;AAEpC;;;;;GAKG;AACH,MAAM,UAAU,MAAM,CAAC,UAA6B;IAClD,OAAO,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE;QACrC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC;YAChB,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAW,CAAC;SACzC,CAAC;QACF,KAAK,CAAC,gBAAgB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE;YAC3C,IAAI,eAAe,CAAC,SAAS,CAAC;gBAC5B,OAAO,UAAU,CAAC,gBAAgB,CAAC;oBACjC,SAAS,EAAE,SAAkB;oBAC7B,MAAM,EAAE,UAA+B;oBACvC,OAAO;iBACR,CAAC,CAAA;YAEJ,MAAM,OAAO,GAAG,CAAC,OAAO,EAAE,OAAO,IAAI,UAAU,CAAC,OAAO,CAAkB,CAAA;YACzE,IAAI,CAAC,OAAO,CAAC,aAAa;gBAAE,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;YAE9F,MAAM,OAAO,GAAG,SAAS,CAAC,OAA8B,CAAA;YACxD,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;YACjC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,eAAe,EAAE,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;gBACtE,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAA;YACzE,CAAC;YACD,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;gBACzC,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;YACvE,CAAC;YAED,MAAM,aAAa,GAAG,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;YAC/D,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO;gBACnC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,QAAQ,EAAE;gBACrE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAA;YAEpD,MAAM,OAAO,GAA+B;gBAC1C,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC;gBACjC,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC;gBACrC,SAAS,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC;oBACrC,MAAM,EAAE,KAAK,CAAC,mBAAmB,CAAC;wBAChC,aAAa;wBACb,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,OAAO;wBACtC,QAAQ,EAAE,OAAO,CAAC,QAAyB;qBAC5C,CAAC;oBACF,OAAO,EAAE;wBACP,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC;wBACjC,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC;wBACrC,EAAE,EAAE,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC;wBACjC,UAAU,EAAE,EAAE;wBACd,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC;wBAChC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;qBAC9B;oBACD,WAAW,EAAE,2BAA2B;oBACxC,KAAK,EAAE,KAAK,CAAC,kBAAkB;iBAChC,CAAC;gBACF,EAAE,EAAE,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC;gBACjC,IAAI,EAAE,eAAe;gBACrB,UAAU,EAAE,GAAG;gBACf,WAAW;gBACX,KAAK,EAAE,OAAO,CAAC,MAAM;aACtB,CAAA;YAED,OAAO,UAAU,CAAC,SAAS,CACzB,UAAU,CAAC,IAAI,CAAC;gBACd,SAAS;gBACT,OAAO;gBACP,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC;oBACrB,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC;oBACpC,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,OAAO;iBACvC,CAAC;aACH,CAAC,CACH,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AA2BD,SAAS,eAAe,CAAC,SAA+C;IACtE,OAAO,CACL,mBAAmB,CAAC,EAAE,CAAC,SAAS,CAAC;QACjC,SAAS,CAAC,OAAO,CAAC,MAAM,KAAK,OAAO;QACpC,OAAO,SAAS,CAAC,OAAO,CAAC,OAAO,KAAK,QAAQ,CAC9C,CAAA;AACH,CAAC;AAED,SAAS,YAAY,CAAC,UAA6B,EAAE,OAA4B;IAC/E,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,OAAO,CAAA;IAC7C,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;IACxC,IAAI,UAAU,CAAC,QAAQ,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC;QAC/D,MAAM,IAAI,KAAK,CAAC,gCAAgC,OAAO,GAAG,CAAC,CAAA;IAE7D,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,IAAI,UAAU,CAAC,MAAM,CAAA;IAC7D,IAAI,UAAU,EAAE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"Charge.js","sourceRoot":"","sources":["../../../src/evm/client/Charge.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,11 +15,11 @@ export declare namespace charge {
|
|
|
15
15
|
type Native = Method.Server<typeof Methods.charge, Defaults>;
|
|
16
16
|
type NativeConfig = BaseConfig & CurrencyConfig & RecipientConfig;
|
|
17
17
|
type BaseConfig = {
|
|
18
|
-
/** EIP-3009 token domain metadata. Required for
|
|
18
|
+
/** EIP-3009 token domain metadata. Required for raw addresses and viem tokens; inferred for known assets. */
|
|
19
19
|
authorization?: Types.AuthorizationConfig | undefined;
|
|
20
|
-
/** EVM chain ID. Required for
|
|
20
|
+
/** EVM chain ID. Required for raw addresses and viem tokens; inferred for known assets. */
|
|
21
21
|
chainId?: number | undefined;
|
|
22
|
-
/** Token decimal places. Required for
|
|
22
|
+
/** Token decimal places. Required for raw addresses; inferred for known assets and viem tokens. */
|
|
23
23
|
decimals?: number | undefined;
|
|
24
24
|
/** Custom settlement override. If omitted, `x402.facilitator` is used. */
|
|
25
25
|
settle?: SettleAuthorization | undefined;
|
|
@@ -27,8 +27,8 @@ export declare namespace charge {
|
|
|
27
27
|
x402?: X402.Options | undefined;
|
|
28
28
|
};
|
|
29
29
|
type CurrencyConfig = {
|
|
30
|
-
/** Token contract address
|
|
31
|
-
currency:
|
|
30
|
+
/** Token contract address, known EVM asset metadata, or viem token definition. */
|
|
31
|
+
currency: Assets.Currency;
|
|
32
32
|
};
|
|
33
33
|
type RecipientConfig = {
|
|
34
34
|
/** Recipient wallet address. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Charge.d.ts","sourceRoot":"","sources":["../../../src/evm/server/Charge.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,UAAU,MAAM,qBAAqB,CAAA;AAEtD,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AAGzC,OAAO,KAAK,IAAI,MAAM,gCAAgC,CAAA;AACtD,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AACtC,OAAO,KAAK,OAAO,MAAM,eAAe,CAAA;AACxC,OAAO,KAAK,KAAK,MAAM,aAAa,CAAA;AAEpC;;;;GAIG;AACH,wBAAgB,MAAM,CACpB,UAAU,EAAE,MAAM,CAAC,YAAY,GAC9B,MAAM,CAAC,MAAM,CAAC,OAAO,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAA;AAsFxD,MAAM,CAAC,OAAO,WAAW,MAAM,CAAC;IAC9B,KAAK,UAAU,GAAG,YAAY,CAAA;IAC9B,KAAK,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAE5D,KAAK,YAAY,GAAG,UAAU,GAAG,cAAc,GAAG,eAAe,CAAA;IAEjE,KAAK,UAAU,GAAG;QAChB,
|
|
1
|
+
{"version":3,"file":"Charge.d.ts","sourceRoot":"","sources":["../../../src/evm/server/Charge.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,UAAU,MAAM,qBAAqB,CAAA;AAEtD,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AAGzC,OAAO,KAAK,IAAI,MAAM,gCAAgC,CAAA;AACtD,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AACtC,OAAO,KAAK,OAAO,MAAM,eAAe,CAAA;AACxC,OAAO,KAAK,KAAK,MAAM,aAAa,CAAA;AAEpC;;;;GAIG;AACH,wBAAgB,MAAM,CACpB,UAAU,EAAE,MAAM,CAAC,YAAY,GAC9B,MAAM,CAAC,MAAM,CAAC,OAAO,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAA;AAsFxD,MAAM,CAAC,OAAO,WAAW,MAAM,CAAC;IAC9B,KAAK,UAAU,GAAG,YAAY,CAAA;IAC9B,KAAK,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAE5D,KAAK,YAAY,GAAG,UAAU,GAAG,cAAc,GAAG,eAAe,CAAA;IAEjE,KAAK,UAAU,GAAG;QAChB,6GAA6G;QAC7G,aAAa,CAAC,EAAE,KAAK,CAAC,mBAAmB,GAAG,SAAS,CAAA;QACrD,2FAA2F;QAC3F,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QAC5B,mGAAmG;QACnG,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QAC7B,0EAA0E;QAC1E,MAAM,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAA;QACxC,kCAAkC;QAClC,IAAI,CAAC,EAAE,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;KAChC,CAAA;IAED,KAAK,cAAc,GAAG;QACpB,kFAAkF;QAClF,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAA;KAC1B,CAAA;IAED,KAAK,eAAe,GAAG;QACrB,gCAAgC;QAChC,SAAS,EAAE,KAAK,MAAM,EAAE,CAAA;KACzB,CAAA;IAED,KAAK,YAAY,GAAG;QAClB,0CAA0C;QAC1C,MAAM,EAAE,MAAM,CAAA;QACd,mDAAmD;QACnD,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QAChC,wCAAwC;QACxC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAChC,CAAA;IAED,KAAK,mBAAmB,GAAG,CAAC,UAAU,EAAE;QACtC,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAA;QAC7D,OAAO,EAAE,KAAK,CAAC,oBAAoB,CAAA;QACnC,OAAO,EAAE,KAAK,CAAC,aAAa,CAAA;QAC5B,MAAM,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAA;KAC1C,KAAK,OAAO,CAAC;QACZ,SAAS,EAAE,MAAM,CAAA;QACjB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAC/B,CAAC,CAAA;IAEF,KAAK,QAAQ,GAAG;QACd,OAAO,EAAE,MAAM,CAAA;QACf,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAA;QACvB,eAAe,EAAE,CAAC,eAAe,CAAC,CAAA;QAClC,QAAQ,EAAE,MAAM,CAAA;QAChB,SAAS,EAAE,KAAK,MAAM,EAAE,CAAA;KACzB,CAAA;CACF"}
|
|
@@ -90,19 +90,27 @@ function resolveConfig(config) {
|
|
|
90
90
|
let chainId = config.chainId;
|
|
91
91
|
let decimals = config.decimals;
|
|
92
92
|
if (Assets.isAsset(currency)) {
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
93
|
+
chainId ??= Assets.toChainId(currency.network);
|
|
94
|
+
}
|
|
95
|
+
if (chainId !== undefined) {
|
|
96
|
+
const resolved = Assets.resolve(currency, Types.networkOf(chainId));
|
|
97
|
+
if (!resolved)
|
|
98
|
+
throw new Error(`EVM currency is not available on chain ID ${chainId}.`);
|
|
99
|
+
address = resolved.address;
|
|
100
|
+
decimals ??= resolved.decimals;
|
|
101
|
+
if (resolved.transfer?.type === Types.eip3009) {
|
|
97
102
|
authorization ??= {
|
|
98
|
-
name:
|
|
99
|
-
version:
|
|
103
|
+
name: resolved.transfer.name,
|
|
104
|
+
version: resolved.transfer.version,
|
|
100
105
|
};
|
|
101
106
|
}
|
|
102
107
|
}
|
|
103
|
-
else {
|
|
108
|
+
else if (Assets.isRawAddress(currency)) {
|
|
104
109
|
address = currency;
|
|
105
110
|
}
|
|
111
|
+
else {
|
|
112
|
+
throw new Error('EVM authorization requires `chainId`.');
|
|
113
|
+
}
|
|
106
114
|
if (!authorization)
|
|
107
115
|
throw new Error('EVM authorization requires `authorization` metadata.');
|
|
108
116
|
if (chainId === undefined)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Charge.js","sourceRoot":"","sources":["../../../src/evm/server/Charge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,uBAAuB,EAAE,MAAM,MAAM,CAAA;AAG1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAA;AACzD,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,eAAe,MAAM,2BAA2B,CAAA;AAC5D,OAAO,KAAK,IAAI,MAAM,gCAAgC,CAAA;AACtD,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AACtC,OAAO,KAAK,OAAO,MAAM,eAAe,CAAA;AACxC,OAAO,KAAK,KAAK,MAAM,aAAa,CAAA;AAUpC,MAAM,UAAU,MAAM,CAAC,UAA+B;IACpD,MAAM,MAAM,GAAG,aAAa,CAAC,UAAU,CAAC,CAAA;IACxC,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAA;IACjC,MAAM,SAAS,GAAG,aAAa,CAAC,KAAK,CAAC,CAAA;IAEtC,OAAO,MAAM,CAAC,QAAQ,CAA2D,OAAO,CAAC,MAAM,EAAE;QAC/F,QAAQ,EAAE;YACR,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,eAAe,EAAE,CAAC,eAAe,CAAC;YAClC,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,SAAS,EAAE,MAAM,CAAC,SAAS;SAC5B;QACD,SAAS;QACT,KAAK,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE;YACzB,MAAM,OAAO,GAAG,UAAU,CAAC,OAAqC,CAAA;YAChE,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,CAAC,OAA8B,CAAA;YACnE,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,OAAO,CAAA;YAC7C,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAA;YAEtD,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,eAAe,EAAE,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;gBACtE,MAAM,IAAI,uBAAuB,CAAC;oBAChC,MAAM,EAAE,oEAAoE;iBAC7E,CAAC,CAAA;YACJ,CAAC;YAED,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;gBACzC,MAAM,IAAI,uBAAuB,CAAC;oBAChC,MAAM,EAAE,qDAAqD;iBAC9D,CAAC,CAAA;YACJ,CAAC;YAED,kBAAkB,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,EAAE,sCAAsC,CAAC,CAAA;YACzF,IAAI,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,MAAM;gBAClC,MAAM,IAAI,uBAAuB,CAAC,EAAE,MAAM,EAAE,mCAAmC,EAAE,CAAC,CAAA;YACpF,IAAI,CAAC,gBAAgB,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC;gBAClF,MAAM,IAAI,uBAAuB,CAAC,EAAE,MAAM,EAAE,2CAA2C,EAAE,CAAC,CAAA;YAC5F,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;YACjD,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,GAAG;gBAClC,MAAM,IAAI,uBAAuB,CAAC,EAAE,MAAM,EAAE,oCAAoC,EAAE,CAAC,CAAA;YACrF,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,GAAG;gBACpC,MAAM,IAAI,uBAAuB,CAAC,EAAE,MAAM,EAAE,+BAA+B,EAAE,CAAC,CAAA;YAEhF,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC;gBAC3C,MAAM,EAAE,KAAK,CAAC,mBAAmB,CAAC;oBAChC,aAAa,EAAE,MAAM,CAAC,aAAa;oBACnC,OAAO;oBACP,QAAQ,EAAE,OAAO,CAAC,QAAyB;iBAC5C,CAAC;gBACF,OAAO,EAAE;oBACP,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC;oBAC9B,KAAK,EAAE,OAAO,CAAC,KAAsB;oBACrC,EAAE,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC1B,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;oBACtC,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;oBACxC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;iBAC7B;gBACD,WAAW,EAAE,2BAA2B;gBACxC,SAAS,EAAE,OAAO,CAAC,SAA0B;gBAC7C,KAAK,EAAE,KAAK,CAAC,kBAAkB;aAChC,CAAC,CAAA;YACF,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,sCAAsC,CAAC,CAAA;YAEhF,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;YAC7E,IAAI,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;gBACtD,MAAM,IAAI,uBAAuB,CAAC,EAAE,MAAM,EAAE,mCAAmC,EAAE,CAAC,CAAA;YACpF,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;gBAClC,UAAU;gBACV,OAAO;gBACP,OAAO;gBACP,MAAM;aACP,CAAC,CAAA;YAEF,OAAO,OAAO,CAAC,IAAI,CAAC;gBAClB,MAAM,EAAE,KAAK,CAAC,aAAa;gBAC3B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,MAAM,EAAE,SAAS;gBACjB,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACzD,CAAC,CAAA;QACJ,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAwFD,SAAS,aAAa,CAAC,MAA2B;IAChD,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CAAA;IACtC,IAAI,OAAsB,CAAA;IAC1B,IAAI,aAAa,GAAG,MAAM,CAAC,aAAa,CAAA;IACxC,IAAI,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;IAC5B,IAAI,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;IAE9B,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7B,OAAO,
|
|
1
|
+
{"version":3,"file":"Charge.js","sourceRoot":"","sources":["../../../src/evm/server/Charge.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-swap.d.ts","sourceRoot":"","sources":["../../../src/tempo/internal/auto-swap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAW3C,oEAAoE;AACpE,eAAO,MAAM,iBAAiB,EAAE,SAAS,OAAO,EAG/C,CAAA;
|
|
1
|
+
{"version":3,"file":"auto-swap.d.ts","sourceRoot":"","sources":["../../../src/tempo/internal/auto-swap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAW3C,oEAAoE;AACpE,eAAO,MAAM,iBAAiB,EAAE,SAAS,OAAO,EAG/C,CAAA;AA+CD;;;;;;GAMG;AACH,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,SAAS,CAAC,UAAU,GAC/B,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAuD/B;AAED,MAAM,CAAC,OAAO,WAAW,SAAS,CAAC;IACjC,KAAK,UAAU,GAAG;QAChB,oDAAoD;QACpD,OAAO,EAAE,OAAO,CAAA;QAChB,yCAAyC;QACzC,SAAS,EAAE,MAAM,CAAA;QACjB,8DAA8D;QAC9D,OAAO,EAAE,SAAS,OAAO,EAAE,CAAA;QAC3B,8DAA8D;QAC9D,QAAQ,EAAE,MAAM,CAAA;QAChB,8CAA8C;QAC9C,QAAQ,EAAE,OAAO,CAAA;KAClB,CAAA;IAED,2EAA2E;IAC3E,KAAK,UAAU,GAAG,SAAS,MAAM,EAAE,GAAG,SAAS,CAAA;CAChD;AAED,uFAAuF;AACvF,wBAAgB,OAAO,CACrB,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,EAChC,iBAAiB,EAAE,SAAS,OAAO,EAAE,GACpC,OAAO,CAAC,QAAQ,GAAG,KAAK,CAa1B;AAED,MAAM,CAAC,OAAO,WAAW,OAAO,CAAC;IAC/B,KAAK,OAAO,GAAG;QACb,+DAA+D;QAC/D,OAAO,CAAC,EAAE,OAAO,EAAE,GAAG,SAAS,CAAA;QAC/B,yEAAyE;QACzE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAC9B,CAAA;IAED,KAAK,KAAK,GAAG,OAAO,GAAG,OAAO,CAAA;IAE9B,KAAK,QAAQ,GAAG;QAAE,OAAO,EAAE,SAAS,OAAO,EAAE,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAA;CAClE;AAED,qBAAa,sBAAuB,SAAQ,KAAK;IAC/C,SAAkB,IAAI,4BAA2B;gBAErC,EAAE,QAAQ,EAAE,EAAE;QAAE,QAAQ,EAAE,OAAO,CAAA;KAAE;CAKhD"}
|
|
@@ -19,6 +19,11 @@ function getApproveCall(client, parameters) {
|
|
|
19
19
|
const call = Actions.token.approve.call;
|
|
20
20
|
return call.length >= 2 ? call(client, parameters) : call(parameters);
|
|
21
21
|
}
|
|
22
|
+
// TODO: Remove once the minimum viem version is >=2.54.0, which uses client-first Tempo call builders.
|
|
23
|
+
function getBuyCall(client, parameters) {
|
|
24
|
+
const call = Actions.dex.buy.call;
|
|
25
|
+
return call.length >= 2 ? call(client, parameters) : call(parameters);
|
|
26
|
+
}
|
|
22
27
|
/**
|
|
23
28
|
* Finds the optimal swap calls to acquire `amountOut` of `tokenOut`,
|
|
24
29
|
* returning an approve + buy call sequence if a viable route is found.
|
|
@@ -60,7 +65,7 @@ export async function findCalls(client, parameters) {
|
|
|
60
65
|
spender: Addresses.stablecoinDex,
|
|
61
66
|
token: tokenIn,
|
|
62
67
|
}),
|
|
63
|
-
|
|
68
|
+
getBuyCall(client, {
|
|
64
69
|
tokenIn,
|
|
65
70
|
tokenOut,
|
|
66
71
|
amountOut,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-swap.js","sourceRoot":"","sources":["../../../src/tempo/internal/auto-swap.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"auto-swap.js","sourceRoot":"","sources":["../../../src/tempo/internal/auto-swap.ts"],"names":[],"mappings":"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"}
|