@tradestack/paymaster 1.2.35 → 1.2.36
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paymaster.service.d.ts","sourceRoot":"","sources":["../../../../src/backend/services/paymaster.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAiB,MAAM,kBAAkB,CAAC;AAQjE,eAAO,MAAM,iBAAiB,GAC5B,QAAQ,GAAG,EACX,cAAa,cAAwD,KACpE,OAAO,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"paymaster.service.d.ts","sourceRoot":"","sources":["../../../../src/backend/services/paymaster.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAiB,MAAM,kBAAkB,CAAC;AAQjE,eAAO,MAAM,iBAAiB,GAC5B,QAAQ,GAAG,EACX,cAAa,cAAwD,KACpE,OAAO,CAAC,MAAM,CAkEhB,CAAC"}
|
|
@@ -17,33 +17,32 @@ const signUserOperation = async (userOp, chainConfig = chains_1.CHAIN_CONFIGS.se
|
|
|
17
17
|
const initCode = userOp.factory
|
|
18
18
|
? ethers_1.ethers.concat([userOp.factory, userOp.factoryData || "0x"])
|
|
19
19
|
: "0x";
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
const accountGasLimits =
|
|
23
|
-
const
|
|
24
|
-
const
|
|
25
|
-
const
|
|
26
|
-
const paymasterVerificationGasLimit = 200000n;
|
|
27
|
-
const paymasterPostOpGasLimit = 100000n;
|
|
20
|
+
// ✅ USE EXISTING PACKED FIELDS from the UserOperation
|
|
21
|
+
// The client (permissionless) already packed these for v0.7
|
|
22
|
+
const accountGasLimits = userOp.accountGasLimits || "0x";
|
|
23
|
+
const gasFees = userOp.gasFees || "0x";
|
|
24
|
+
const paymasterVerificationGasLimit = chainConfig.gasSettings?.verificationGasLimit || 200000n;
|
|
25
|
+
const paymasterPostOpGasLimit = chainConfig.gasSettings?.postOpGasLimit || 100000n;
|
|
28
26
|
const paymasterGasLimitsPacked = ethers_1.ethers.zeroPadValue(ethers_1.ethers.toBeHex((paymasterVerificationGasLimit << 128n) | paymasterPostOpGasLimit), 32);
|
|
29
27
|
const paymasterAndDataForHash = ethers_1.ethers.concat([
|
|
30
28
|
chainConfig.paymasterAddress,
|
|
31
29
|
paymasterGasLimitsPacked,
|
|
32
30
|
ethers_1.ethers.AbiCoder.defaultAbiCoder().encode(["uint48", "uint48"], [validUntil, validAfter]),
|
|
33
|
-
"0x" + "00".repeat(65),
|
|
31
|
+
"0x" + "00".repeat(65), // Placeholder for signature
|
|
34
32
|
]);
|
|
33
|
+
// For v0.7, the hash expects the paymasterAndData to include the gas limits
|
|
35
34
|
const hash = await paymasterContract.getHash({
|
|
36
35
|
sender: userOp.sender,
|
|
37
36
|
nonce: userOp.nonce,
|
|
38
|
-
initCode,
|
|
37
|
+
initCode: initCode,
|
|
39
38
|
callData: userOp.callData,
|
|
40
|
-
accountGasLimits,
|
|
41
|
-
preVerificationGas: userOp.preVerificationGas ||
|
|
42
|
-
gasFees,
|
|
39
|
+
accountGasLimits: accountGasLimits, // Use existing packed value
|
|
40
|
+
preVerificationGas: userOp.preVerificationGas || 0n,
|
|
41
|
+
gasFees: gasFees, // Use existing packed value
|
|
43
42
|
paymasterAndData: paymasterAndDataForHash,
|
|
44
43
|
signature: userOp.signature || "0x",
|
|
45
44
|
}, validUntil, validAfter);
|
|
46
|
-
console.log(`[${chainConfig.name}] Hash from contract
|
|
45
|
+
console.log(`[${chainConfig.name}] Hash from contract: ${hash}`);
|
|
47
46
|
const signature = await connectedSigner.signMessage(ethers_1.ethers.getBytes(hash));
|
|
48
47
|
const paymasterData = ethers_1.ethers.concat([
|
|
49
48
|
ethers_1.ethers.AbiCoder.defaultAbiCoder().encode(["uint48", "uint48"], [validUntil, validAfter]),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paymaster.service.js","sourceRoot":"","sources":["../../../../src/backend/services/paymaster.service.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAgC;AAChC,6CAAiE;AACjE,4DAAqC;AACrC,mDAI8B;AAEvB,MAAM,iBAAiB,GAAG,KAAK,EACpC,MAAW,EACX,cAA8B,sBAAa,CAAC,OAAyB,EACpD,EAAE;IACnB,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IACjD,MAAM,UAAU,GAAG,UAAU,GAAG,eAAM,CAAC,sBAAsB,CAAC;IAE9D,MAAM,iBAAiB,GAAG,IAAA,+BAAoB,EAAC,WAAW,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,IAAA,sBAAW,EAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,eAAe,GAAG,iBAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEjD,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO;QAC7B,CAAC,CAAC,eAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,WAAW,IAAI,IAAI,CAAC,CAAC;QAC7D,CAAC,CAAC,IAAI,CAAC;IAET,
|
|
1
|
+
{"version":3,"file":"paymaster.service.js","sourceRoot":"","sources":["../../../../src/backend/services/paymaster.service.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAgC;AAChC,6CAAiE;AACjE,4DAAqC;AACrC,mDAI8B;AAEvB,MAAM,iBAAiB,GAAG,KAAK,EACpC,MAAW,EACX,cAA8B,sBAAa,CAAC,OAAyB,EACpD,EAAE;IACnB,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IACjD,MAAM,UAAU,GAAG,UAAU,GAAG,eAAM,CAAC,sBAAsB,CAAC;IAE9D,MAAM,iBAAiB,GAAG,IAAA,+BAAoB,EAAC,WAAW,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,IAAA,sBAAW,EAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,eAAe,GAAG,iBAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEjD,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO;QAC7B,CAAC,CAAC,eAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,WAAW,IAAI,IAAI,CAAC,CAAC;QAC7D,CAAC,CAAC,IAAI,CAAC;IAET,sDAAsD;IACtD,4DAA4D;IAC5D,MAAM,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,IAAI,IAAI,CAAC;IACzD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC;IAEvC,MAAM,6BAA6B,GACjC,WAAW,CAAC,WAAW,EAAE,oBAAoB,IAAI,OAAO,CAAC;IAC3D,MAAM,uBAAuB,GAC3B,WAAW,CAAC,WAAW,EAAE,cAAc,IAAI,OAAO,CAAC;IACrD,MAAM,wBAAwB,GAAG,eAAM,CAAC,YAAY,CAClD,eAAM,CAAC,OAAO,CAAC,CAAC,6BAA6B,IAAI,IAAI,CAAC,GAAG,uBAAuB,CAAC,EACjF,EAAE,CACH,CAAC;IAEF,MAAM,uBAAuB,GAAG,eAAM,CAAC,MAAM,CAAC;QAC5C,WAAW,CAAC,gBAA0B;QACtC,wBAAwB;QACxB,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACtC,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACpB,CAAC,UAAU,EAAE,UAAU,CAAC,CACzB;QACD,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,4BAA4B;KACrD,CAAC,CAAC;IAEH,4EAA4E;IAC5E,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAC1C;QACE,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,QAAQ,EAAE,QAAQ;QAClB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,gBAAgB,EAAE,gBAAgB,EAAE,4BAA4B;QAChE,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,IAAI,EAAE;QACnD,OAAO,EAAE,OAAO,EAAE,4BAA4B;QAC9C,gBAAgB,EAAE,uBAAuB;QACzC,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,IAAI;KACpC,EACD,UAAU,EACV,UAAU,CACX,CAAC;IAEF,OAAO,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,IAAI,yBAAyB,IAAI,EAAE,CAAC,CAAC;IAEjE,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,WAAW,CAAC,eAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAE3E,MAAM,aAAa,GAAG,eAAM,CAAC,MAAM,CAAC;QAClC,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACtC,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACpB,CAAC,UAAU,EAAE,UAAU,CAAC,CACzB;QACD,SAAS;KACV,CAAC,CAAC;IAEH,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AArEW,QAAA,iBAAiB,qBAqE5B"}
|
package/package.json
CHANGED