@lifi/sdk 3.6.0 → 3.6.2-beta.0
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/package.json +3 -3
- package/src/_cjs/core/BaseStepExecutor.js +13 -38
- package/src/_cjs/core/BaseStepExecutor.js.map +1 -1
- package/src/_cjs/core/EVM/EVMStepExecutor.js +329 -359
- package/src/_cjs/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_cjs/core/EVM/checkAllowance.js +18 -9
- package/src/_cjs/core/EVM/checkAllowance.js.map +1 -1
- package/src/_cjs/core/EVM/checkPermitSupport.js +2 -2
- package/src/_cjs/core/EVM/checkPermitSupport.js.map +1 -1
- package/src/_cjs/core/EVM/permits/allowanceTransfer.js +8 -8
- package/src/_cjs/core/EVM/permits/allowanceTransfer.js.map +1 -1
- package/src/_cjs/core/EVM/permits/getNativePermit.js +12 -10
- package/src/_cjs/core/EVM/permits/getNativePermit.js.map +1 -1
- package/src/_cjs/core/EVM/permits/signPermit2Message.js +27 -26
- package/src/_cjs/core/EVM/permits/signPermit2Message.js.map +1 -1
- package/src/_cjs/core/EVM/permits/signatureTransfer.js +8 -8
- package/src/_cjs/core/EVM/permits/signatureTransfer.js.map +1 -1
- package/src/_cjs/core/EVM/typeguards.js +5 -2
- package/src/_cjs/core/EVM/typeguards.js.map +1 -1
- package/src/_cjs/core/EVM/types.js.map +1 -1
- package/src/_cjs/core/Solana/KeypairWalletAdapter.js +8 -33
- package/src/_cjs/core/Solana/KeypairWalletAdapter.js.map +1 -1
- package/src/_cjs/core/Solana/SolanaStepExecutor.js +97 -112
- package/src/_cjs/core/Solana/SolanaStepExecutor.js.map +1 -1
- package/src/_cjs/core/StatusManager.js +103 -136
- package/src/_cjs/core/StatusManager.js.map +1 -1
- package/src/_cjs/core/UTXO/UTXOStepExecutor.js +136 -151
- package/src/_cjs/core/UTXO/UTXOStepExecutor.js.map +1 -1
- package/src/_cjs/core/prepareRestart.js +7 -1
- package/src/_cjs/core/prepareRestart.js.map +1 -1
- package/src/_cjs/errors/SDKError.js +5 -30
- package/src/_cjs/errors/SDKError.js.map +1 -1
- package/src/_cjs/errors/baseError.js +2 -12
- package/src/_cjs/errors/baseError.js.map +1 -1
- package/src/_cjs/errors/httpError.js +6 -36
- package/src/_cjs/errors/httpError.js.map +1 -1
- package/src/_cjs/index.js +3 -2
- package/src/_cjs/index.js.map +1 -1
- package/src/_cjs/services/api.js +2 -4
- package/src/_cjs/services/api.js.map +1 -1
- package/src/_cjs/utils/withDedupe.js +1 -6
- package/src/_cjs/utils/withDedupe.js.map +1 -1
- package/src/_cjs/version.js +1 -1
- package/src/_cjs/version.js.map +1 -1
- package/src/_esm/core/BaseStepExecutor.js +13 -38
- package/src/_esm/core/BaseStepExecutor.js.map +1 -1
- package/src/_esm/core/EVM/EVMStepExecutor.js +367 -397
- package/src/_esm/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_esm/core/EVM/checkAllowance.js +18 -9
- package/src/_esm/core/EVM/checkAllowance.js.map +1 -1
- package/src/_esm/core/EVM/checkPermitSupport.js +2 -2
- package/src/_esm/core/EVM/checkPermitSupport.js.map +1 -1
- package/src/_esm/core/EVM/permits/allowanceTransfer.js +8 -8
- package/src/_esm/core/EVM/permits/allowanceTransfer.js.map +1 -1
- package/src/_esm/core/EVM/permits/getNativePermit.js +12 -10
- package/src/_esm/core/EVM/permits/getNativePermit.js.map +1 -1
- package/src/_esm/core/EVM/permits/signPermit2Message.js +29 -28
- package/src/_esm/core/EVM/permits/signPermit2Message.js.map +1 -1
- package/src/_esm/core/EVM/permits/signatureTransfer.js +8 -8
- package/src/_esm/core/EVM/permits/signatureTransfer.js.map +1 -1
- package/src/_esm/core/EVM/typeguards.js +4 -2
- package/src/_esm/core/EVM/typeguards.js.map +1 -1
- package/src/_esm/core/EVM/types.js.map +1 -1
- package/src/_esm/core/Solana/KeypairWalletAdapter.js +12 -37
- package/src/_esm/core/Solana/KeypairWalletAdapter.js.map +1 -1
- package/src/_esm/core/Solana/SolanaStepExecutor.js +105 -120
- package/src/_esm/core/Solana/SolanaStepExecutor.js.map +1 -1
- package/src/_esm/core/StatusManager.js +132 -165
- package/src/_esm/core/StatusManager.js.map +1 -1
- package/src/_esm/core/UTXO/UTXOStepExecutor.js +144 -159
- package/src/_esm/core/UTXO/UTXOStepExecutor.js.map +1 -1
- package/src/_esm/core/prepareRestart.js +10 -1
- package/src/_esm/core/prepareRestart.js.map +1 -1
- package/src/_esm/errors/SDKError.js +5 -30
- package/src/_esm/errors/SDKError.js.map +1 -1
- package/src/_esm/errors/baseError.js +2 -12
- package/src/_esm/errors/baseError.js.map +1 -1
- package/src/_esm/errors/httpError.js +6 -36
- package/src/_esm/errors/httpError.js.map +1 -1
- package/src/_esm/index.js +1 -1
- package/src/_esm/index.js.map +1 -1
- package/src/_esm/services/api.js +2 -4
- package/src/_esm/services/api.js.map +1 -1
- package/src/_esm/utils/withDedupe.js +1 -6
- package/src/_esm/utils/withDedupe.js.map +1 -1
- package/src/_esm/version.js +1 -1
- package/src/_esm/version.js.map +1 -1
- package/src/_types/core/EVM/EVMStepExecutor.d.ts.map +1 -1
- package/src/_types/core/EVM/checkAllowance.d.ts +2 -3
- package/src/_types/core/EVM/checkAllowance.d.ts.map +1 -1
- package/src/_types/core/EVM/checkPermitSupport.d.ts.map +1 -1
- package/src/_types/core/EVM/permits/allowanceTransfer.d.ts +4 -4
- package/src/_types/core/EVM/permits/allowanceTransfer.d.ts.map +1 -1
- package/src/_types/core/EVM/permits/getNativePermit.d.ts +1 -2
- package/src/_types/core/EVM/permits/getNativePermit.d.ts.map +1 -1
- package/src/_types/core/EVM/permits/signPermit2Message.d.ts +2 -11
- package/src/_types/core/EVM/permits/signPermit2Message.d.ts.map +1 -1
- package/src/_types/core/EVM/permits/signatureTransfer.d.ts +2 -2
- package/src/_types/core/EVM/permits/signatureTransfer.d.ts.map +1 -1
- package/src/_types/core/EVM/permits/types.d.ts +3 -9
- package/src/_types/core/EVM/permits/types.d.ts.map +1 -1
- package/src/_types/core/EVM/typeguards.d.ts +6 -2
- package/src/_types/core/EVM/typeguards.d.ts.map +1 -1
- package/src/_types/core/EVM/types.d.ts +2 -5
- package/src/_types/core/EVM/types.d.ts.map +1 -1
- package/src/_types/core/StatusManager.d.ts.map +1 -1
- package/src/_types/core/prepareRestart.d.ts.map +1 -1
- package/src/_types/core/types.d.ts +2 -0
- package/src/_types/core/types.d.ts.map +1 -1
- package/src/_types/index.d.ts +1 -1
- package/src/_types/index.d.ts.map +1 -1
- package/src/_types/services/api.d.ts +2 -2
- package/src/_types/services/api.d.ts.map +1 -1
- package/src/_types/version.d.ts +1 -1
- package/src/_types/version.d.ts.map +1 -1
- package/src/core/EVM/EVMStepExecutor.ts +39 -44
- package/src/core/EVM/checkAllowance.ts +28 -19
- package/src/core/EVM/checkPermitSupport.ts +14 -2
- package/src/core/EVM/permits/allowanceTransfer.ts +14 -10
- package/src/core/EVM/permits/getNativePermit.ts +13 -11
- package/src/core/EVM/permits/signPermit2Message.ts +43 -63
- package/src/core/EVM/permits/signatureTransfer.ts +10 -10
- package/src/core/EVM/permits/types.ts +3 -16
- package/src/core/EVM/typeguards.ts +14 -4
- package/src/core/EVM/types.ts +2 -6
- package/src/core/StatusManager.ts +5 -3
- package/src/core/prepareRestart.ts +14 -2
- package/src/core/types.ts +2 -0
- package/src/index.ts +1 -1
- package/src/services/api.ts +3 -6
- package/src/version.ts +1 -1
- package/src/_cjs/core/EVM/permits/signNativePermitMessage.js +0 -20
- package/src/_cjs/core/EVM/permits/signNativePermitMessage.js.map +0 -1
- package/src/_cjs/core/EVM/permits/utils.js +0 -31
- package/src/_cjs/core/EVM/permits/utils.js.map +0 -1
- package/src/_esm/core/EVM/permits/signNativePermitMessage.js +0 -16
- package/src/_esm/core/EVM/permits/signNativePermitMessage.js.map +0 -1
- package/src/_esm/core/EVM/permits/utils.js +0 -26
- package/src/_esm/core/EVM/permits/utils.js.map +0 -1
- package/src/_types/core/EVM/permits/signNativePermitMessage.d.ts +0 -4
- package/src/_types/core/EVM/permits/signNativePermitMessage.d.ts.map +0 -1
- package/src/_types/core/EVM/permits/utils.d.ts +0 -6
- package/src/_types/core/EVM/permits/utils.d.ts.map +0 -1
- package/src/core/EVM/permits/signNativePermitMessage.ts +0 -27
- package/src/core/EVM/permits/utils.ts +0 -40
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EVMStepExecutor.js","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"EVMStepExecutor.js","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
import { signTypedData } from 'viem/actions';
|
|
2
|
+
import { getAction } from 'viem/utils';
|
|
1
3
|
import { MaxUint256 } from '../../constants.js';
|
|
2
4
|
import { getAllowance } from './getAllowance.js';
|
|
3
5
|
import { parseEVMErrors } from './parseEVMErrors.js';
|
|
4
6
|
import { getNativePermit } from './permits/getNativePermit.js';
|
|
5
|
-
import { signNativePermitMessage } from './permits/signNativePermitMessage.js';
|
|
6
|
-
import { prettifyNativePermitData } from './permits/utils.js';
|
|
7
7
|
import { setAllowance } from './setAllowance.js';
|
|
8
8
|
import { isRelayerStep } from './typeguards.js';
|
|
9
9
|
import { waitForTransactionReceipt } from './waitForTransactionReceipt.js';
|
|
@@ -35,13 +35,10 @@ export const checkAllowance = async ({ client, chain, step, statusManager, execu
|
|
|
35
35
|
const isRelayerTransaction = isRelayerStep(step);
|
|
36
36
|
let nativePermitData;
|
|
37
37
|
if (isRelayerTransaction) {
|
|
38
|
-
|
|
39
|
-
if (permitData) {
|
|
40
|
-
nativePermitData = prettifyNativePermitData(permitData);
|
|
41
|
-
}
|
|
38
|
+
nativePermitData = step.typedData.find((p) => p.primaryType === 'Permit');
|
|
42
39
|
}
|
|
43
40
|
else {
|
|
44
|
-
nativePermitData = await getNativePermit(client, chain, step.action.fromToken.address, fromAmount);
|
|
41
|
+
nativePermitData = await getNativePermit(client, chain.id, step.action.fromToken.address, chain.permit2Proxy, fromAmount);
|
|
45
42
|
}
|
|
46
43
|
statusManager.updateProcess(step, allowanceProcess.type, 'ACTION_REQUIRED');
|
|
47
44
|
if (!allowUserInteraction) {
|
|
@@ -50,9 +47,21 @@ export const checkAllowance = async ({ client, chain, step, statusManager, execu
|
|
|
50
47
|
// Check if proxy contract is available and token supports native permits, not available for atomic batch
|
|
51
48
|
const nativePermitSupported = !!nativePermitData && !!chain.permit2Proxy && !batchingSupported;
|
|
52
49
|
if (nativePermitSupported && nativePermitData) {
|
|
53
|
-
const
|
|
50
|
+
const signature = await getAction(client, signTypedData, 'signTypedData')({
|
|
51
|
+
account: client.account,
|
|
52
|
+
domain: nativePermitData.domain,
|
|
53
|
+
types: nativePermitData.types,
|
|
54
|
+
primaryType: 'Permit',
|
|
55
|
+
message: nativePermitData.message,
|
|
56
|
+
});
|
|
54
57
|
statusManager.updateProcess(step, allowanceProcess.type, 'DONE');
|
|
55
|
-
return {
|
|
58
|
+
return {
|
|
59
|
+
status: 'NATIVE_PERMIT',
|
|
60
|
+
data: {
|
|
61
|
+
...nativePermitData,
|
|
62
|
+
signature,
|
|
63
|
+
},
|
|
64
|
+
};
|
|
56
65
|
}
|
|
57
66
|
// Set new allowance
|
|
58
67
|
const approveAmount = permit2Supported ? MaxUint256 : fromAmount;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkAllowance.js","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"checkAllowance.js","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,11 +24,11 @@ export const checkPermitSupport = async ({ chain, tokenAddress, ownerAddress, am
|
|
|
24
24
|
let nativePermit;
|
|
25
25
|
// Try with wallet client first, fallback to public client
|
|
26
26
|
try {
|
|
27
|
-
nativePermit = await getNativePermit(client, chain, tokenAddress, amount);
|
|
27
|
+
nativePermit = await getNativePermit(client, chain.id, tokenAddress, chain.permit2Proxy, amount);
|
|
28
28
|
}
|
|
29
29
|
catch {
|
|
30
30
|
client = await getPublicClient(chain.id);
|
|
31
|
-
nativePermit = await getNativePermit(client, chain, tokenAddress, amount);
|
|
31
|
+
nativePermit = await getNativePermit(client, chain.id, tokenAddress, chain.permit2Proxy, amount);
|
|
32
32
|
}
|
|
33
33
|
let permit2Allowance;
|
|
34
34
|
// Check Permit2 allowance if available on chain
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkPermitSupport.js","sourceRoot":"","sources":["../../../core/EVM/checkPermitSupport.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAUnD;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,EACvC,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,MAAM,GAMP,EAA0B,EAAE;IAC3B,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,CAA4B,CAAA;IAE7E,IAAI,MAAM,GAAG,MAAM,QAAQ,EAAE,eAAe,EAAE,EAAE,CAAA;IAEhD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,GAAG,MAAM,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAC1C,CAAC;IAED,IAAI,YAA0C,CAAA;IAC9C,0DAA0D;IAC1D,IAAI,CAAC;QACH,YAAY,GAAG,MAAM,eAAe,
|
|
1
|
+
{"version":3,"file":"checkPermitSupport.js","sourceRoot":"","sources":["../../../core/EVM/checkPermitSupport.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAUnD;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,EACvC,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,MAAM,GAMP,EAA0B,EAAE;IAC3B,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,CAA4B,CAAA;IAE7E,IAAI,MAAM,GAAG,MAAM,QAAQ,EAAE,eAAe,EAAE,EAAE,CAAA;IAEhD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,GAAG,MAAM,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAC1C,CAAC;IAED,IAAI,YAA0C,CAAA;IAC9C,0DAA0D;IAC1D,IAAI,CAAC;QACH,YAAY,GAAG,MAAM,eAAe,CAClC,MAAM,EACN,KAAK,CAAC,EAAE,EACR,YAAY,EACZ,KAAK,CAAC,YAAuB,EAC7B,MAAM,CACP,CAAA;IACH,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,GAAG,MAAM,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QACxC,YAAY,GAAG,MAAM,eAAe,CAClC,MAAM,EACN,KAAK,CAAC,EAAE,EACR,YAAY,EACZ,KAAK,CAAC,YAAuB,EAC7B,MAAM,CACP,CAAA;IACH,CAAC;IAED,IAAI,gBAAoC,CAAA;IACxC,gDAAgD;IAChD,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAClB,gBAAgB,GAAG,MAAM,YAAY,CACnC,KAAK,CAAC,EAAE,EACR,YAAY,EACZ,YAAY,EACZ,KAAK,CAAC,OAAkB,CACzB,CAAA;IACH,CAAC;IAED,OAAO;QACL,qBAAqB,EAAE,CAAC,CAAC,YAAY;QACrC,0BAA0B,EACxB,CAAC,CAAC,gBAAgB,IAAI,gBAAgB,IAAI,MAAM;KACnD,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -37,7 +37,7 @@ export function getPermitSingleData(permit, permit2Address, chainId) {
|
|
|
37
37
|
validatePermitDetails(permit.details);
|
|
38
38
|
return {
|
|
39
39
|
domain,
|
|
40
|
-
|
|
40
|
+
message: permit,
|
|
41
41
|
};
|
|
42
42
|
}
|
|
43
43
|
export function getPermitBatchData(permit, permit2Address, chainId) {
|
|
@@ -46,7 +46,7 @@ export function getPermitBatchData(permit, permit2Address, chainId) {
|
|
|
46
46
|
permit.details.forEach(validatePermitDetails);
|
|
47
47
|
return {
|
|
48
48
|
domain,
|
|
49
|
-
|
|
49
|
+
message: permit,
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
52
|
export function getPermitData(permit, permit2Address, chainId) {
|
|
@@ -57,32 +57,32 @@ export function getPermitData(permit, permit2Address, chainId) {
|
|
|
57
57
|
return {
|
|
58
58
|
domain,
|
|
59
59
|
types: PERMIT_TYPES,
|
|
60
|
-
|
|
60
|
+
message: permit,
|
|
61
61
|
};
|
|
62
62
|
}
|
|
63
63
|
permit.details.forEach(validatePermitDetails);
|
|
64
64
|
return {
|
|
65
65
|
domain,
|
|
66
66
|
types: PERMIT_BATCH_TYPES,
|
|
67
|
-
|
|
67
|
+
message: permit,
|
|
68
68
|
};
|
|
69
69
|
}
|
|
70
70
|
export function hash(permit, permit2Address, chainId) {
|
|
71
71
|
if (isPermit(permit)) {
|
|
72
|
-
const { domain,
|
|
72
|
+
const { domain, message } = getPermitSingleData(permit, permit2Address, chainId);
|
|
73
73
|
return hashTypedData({
|
|
74
74
|
domain,
|
|
75
75
|
types: PERMIT_TYPES,
|
|
76
76
|
primaryType: 'PermitSingle',
|
|
77
|
-
message:
|
|
77
|
+
message: message,
|
|
78
78
|
});
|
|
79
79
|
}
|
|
80
|
-
const { domain,
|
|
80
|
+
const { domain, message } = getPermitBatchData(permit, permit2Address, chainId);
|
|
81
81
|
return hashTypedData({
|
|
82
82
|
domain,
|
|
83
83
|
types: PERMIT_BATCH_TYPES,
|
|
84
84
|
primaryType: 'PermitBatch',
|
|
85
|
-
message:
|
|
85
|
+
message: message,
|
|
86
86
|
});
|
|
87
87
|
}
|
|
88
88
|
function validatePermitDetails(details) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"allowanceTransfer.js","sourceRoot":"","sources":["../../../../core/EVM/permits/allowanceTransfer.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,aAAa,GACd,MAAM,MAAM,CAAA;AACb,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAE3C,MAAM,CAAC,MAAM,0BAA0B,GAAG,UAAU,CAAA;AACpD,MAAM,CAAC,MAAM,sBAAsB,GAAG,SAAS,CAAA;AAC/C,MAAM,CAAC,MAAM,eAAe,GAAG,SAAS,CAAA;AAiCxC,MAAM,cAAc,GAAG;IACrB,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;IAClC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;IACnC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE;IACtC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE;CACzB,CAAA;AAEV,MAAM,YAAY,GAAG;IACnB,aAAa,EAAE,cAAc;IAC7B,YAAY,EAAE;QACZ,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE;QAC1C,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;QACpC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE;KACzC;CACO,CAAA;AAEV,MAAM,kBAAkB,GAAG;IACzB,aAAa,EAAE,cAAc;IAC7B,WAAW,EAAE;QACX,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,iBAAiB,EAAE;QAC5C,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;QACpC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE;KACzC;CACO,CAAA;AAEV,SAAS,QAAQ,CAAC,MAAkC;IAClD,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;AACvC,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,MAAoB,EACpB,cAAuB,EACvB,OAAe;IAEf,SAAS,CAAC,cAAc,IAAI,MAAM,CAAC,WAAW,EAAE,2BAA2B,CAAC,CAAA;IAE5E,MAAM,MAAM,GAAG,aAAa,CAAC,cAAc,EAAE,OAAO,CAAC,CAAA;IACrD,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAErC,OAAO;QACL,MAAM;QACN,
|
|
1
|
+
{"version":3,"file":"allowanceTransfer.js","sourceRoot":"","sources":["../../../../core/EVM/permits/allowanceTransfer.ts"],"names":[],"mappings":"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"}
|
|
@@ -91,9 +91,9 @@ function validateDomainSeparator({ name, version, chainId, verifyingContract, do
|
|
|
91
91
|
* @param tokenAddress - The address of the token to check for permit support
|
|
92
92
|
* @returns {Promise<NativePermitData>} Object containing permit data including name, version, nonce and support status
|
|
93
93
|
*/
|
|
94
|
-
export const getNativePermit = async (client,
|
|
94
|
+
export const getNativePermit = async (client, chainId, tokenAddress, spenderAddress, amount) => {
|
|
95
95
|
try {
|
|
96
|
-
const multicallAddress = await getMulticallAddress(
|
|
96
|
+
const multicallAddress = await getMulticallAddress(chainId);
|
|
97
97
|
const contractCalls = [
|
|
98
98
|
{
|
|
99
99
|
address: tokenAddress,
|
|
@@ -133,24 +133,25 @@ export const getNativePermit = async (client, chain, tokenAddress, amount) => {
|
|
|
133
133
|
const { isValid, domain } = validateDomainSeparator({
|
|
134
134
|
name: nameResult.result,
|
|
135
135
|
version: versionResult.result ?? '1',
|
|
136
|
-
chainId: BigInt(
|
|
136
|
+
chainId: BigInt(chainId),
|
|
137
137
|
verifyingContract: tokenAddress,
|
|
138
138
|
domainSeparator: domainSeparatorResult.result,
|
|
139
139
|
});
|
|
140
140
|
if (!isValid) {
|
|
141
141
|
return undefined;
|
|
142
142
|
}
|
|
143
|
-
const
|
|
143
|
+
const message = {
|
|
144
144
|
owner: client.account.address,
|
|
145
|
-
spender:
|
|
145
|
+
spender: spenderAddress,
|
|
146
146
|
value: amount,
|
|
147
147
|
nonce: noncesResult.result,
|
|
148
148
|
deadline: BigInt(Math.floor(Date.now() / 1000) + 30 * 60), // 30 minutes
|
|
149
149
|
};
|
|
150
150
|
return {
|
|
151
|
+
primaryType: 'Permit',
|
|
151
152
|
domain,
|
|
152
153
|
types: eip2612Types,
|
|
153
|
-
|
|
154
|
+
message,
|
|
154
155
|
};
|
|
155
156
|
}
|
|
156
157
|
const [nameResult, domainSeparatorResult, noncesResult, versionResult] = (await Promise.allSettled(contractCalls.map((call) => readContract(client, call))));
|
|
@@ -164,24 +165,25 @@ export const getNativePermit = async (client, chain, tokenAddress, amount) => {
|
|
|
164
165
|
const { isValid, domain } = validateDomainSeparator({
|
|
165
166
|
name,
|
|
166
167
|
version,
|
|
167
|
-
chainId: BigInt(
|
|
168
|
+
chainId: BigInt(chainId),
|
|
168
169
|
verifyingContract: tokenAddress,
|
|
169
170
|
domainSeparator: domainSeparatorResult.value,
|
|
170
171
|
});
|
|
171
172
|
if (!isValid) {
|
|
172
173
|
return undefined;
|
|
173
174
|
}
|
|
174
|
-
const
|
|
175
|
+
const message = {
|
|
175
176
|
owner: client.account.address,
|
|
176
|
-
spender:
|
|
177
|
+
spender: spenderAddress,
|
|
177
178
|
value: amount,
|
|
178
179
|
nonce: noncesResult.value,
|
|
179
180
|
deadline: BigInt(Math.floor(Date.now() / 1000) + 30 * 60), // 30 minutes
|
|
180
181
|
};
|
|
181
182
|
return {
|
|
183
|
+
primaryType: 'Permit',
|
|
182
184
|
domain,
|
|
183
185
|
types: eip2612Types,
|
|
184
|
-
|
|
186
|
+
message,
|
|
185
187
|
};
|
|
186
188
|
}
|
|
187
189
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNativePermit.js","sourceRoot":"","sources":["../../../../core/EVM/permits/getNativePermit.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getNativePermit.js","sourceRoot":"","sources":["../../../../core/EVM/permits/getNativePermit.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,SAAS,EACT,GAAG,EACH,kBAAkB,EAClB,OAAO,EACP,KAAK,GACN,MAAM,MAAM,CAAA;AAGb,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAGjD;;;;;;;GAOG;AACH,MAAM,sBAAsB,GAC1B,oEAA2E,CAAA;AAE7E;;;;;;;GAOG;AACH,MAAM,gCAAgC,GACpC,oEAA2E,CAAA;AAE7E,SAAS,mBAAmB,CAAC,EAC3B,IAAI,EACJ,OAAO,EACP,OAAO,EACP,iBAAiB,EACjB,QAAQ,GAAG,KAAK,GAOjB;IACC,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;IACzC,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;IAE/C,MAAM,OAAO,GAAG,QAAQ;QACtB,CAAC,CAAC,mBAAmB,CACjB,kBAAkB,CAAC,6CAA6C,CAAC,EACjE;YACE,gCAAgC;YAChC,QAAQ;YACR,WAAW;YACX,iBAAiB;YACjB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;SAClC,CACF;QACH,CAAC,CAAC,mBAAmB,CACjB,kBAAkB,CAAC,6CAA6C,CAAC,EACjE;YACE,sBAAsB;YACtB,QAAQ;YACR,WAAW;YACX,OAAO;YACP,iBAAiB;SAClB,CACF,CAAA;IAEL,OAAO,SAAS,CAAC,OAAO,CAAC,CAAA;AAC3B,CAAC;AAED,yDAAyD;AACzD,kFAAkF;AAClF,sEAAsE;AACtE,0CAA0C;AAC1C,SAAS,uBAAuB,CAAC,EAC/B,IAAI,EACJ,OAAO,EACP,OAAO,EACP,iBAAiB,EACjB,eAAe,GAOhB;IACC,IAAI,CAAC,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;QAC9B,OAAO;YACL,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,EAAE;SACX,CAAA;IACH,CAAC;IAED,KAAK,MAAM,QAAQ,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;QACrC,MAAM,UAAU,GAAG,mBAAmB,CAAC;YACrC,IAAI;YACJ,OAAO;YACP,OAAO;YACP,iBAAiB;YACjB,QAAQ;SACT,CAAC,CAAA;QACF,IAAI,eAAe,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,WAAW,EAAE,EAAE,CAAC;YAC/D,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,QAAQ;oBACd,CAAC,CAAC;wBACE,IAAI;wBACJ,OAAO;wBACP,iBAAiB;wBACjB,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;qBACxC;oBACH,CAAC,CAAC;wBACE,IAAI;wBACJ,OAAO;wBACP,OAAO;wBACP,iBAAiB;qBAClB;aACN,CAAA;QACH,CAAC;IACH,CAAC;IAED,OAAO;QACL,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,EAAE;KACX,CAAA;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAClC,MAAc,EACd,OAAe,EACf,YAAqB,EACrB,cAAuB,EACvB,MAAc,EACyB,EAAE;IACzC,IAAI,CAAC;QACH,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,CAAA;QAE3D,MAAM,aAAa,GAAG;YACpB;gBACE,OAAO,EAAE,YAAY;gBACrB,GAAG,EAAE,UAAU;gBACf,YAAY,EAAE,MAAM;aACrB;YACD;gBACE,OAAO,EAAE,YAAY;gBACrB,GAAG,EAAE,UAAU;gBACf,YAAY,EAAE,kBAAkB;aACjC;YACD;gBACE,OAAO,EAAE,YAAY;gBACrB,GAAG,EAAE,UAAU;gBACf,YAAY,EAAE,QAAQ;gBACtB,IAAI,EAAE,CAAC,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC;aAChC;YACD;gBACE,OAAO,EAAE,YAAY;gBACrB,GAAG,EAAE,UAAU;gBACf,YAAY,EAAE,SAAS;aACxB;SACO,CAAA;QAEV,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,CAAC,UAAU,EAAE,qBAAqB,EAAE,YAAY,EAAE,aAAa,CAAC,GACpE,MAAM,SAAS,CAAC,MAAM,EAAE;gBACtB,SAAS,EAAE,aAAa;gBACxB,gBAAgB;aACjB,CAAC,CAAA;YAEJ,IACE,UAAU,CAAC,MAAM,KAAK,SAAS;gBAC/B,qBAAqB,CAAC,MAAM,KAAK,SAAS;gBAC1C,YAAY,CAAC,MAAM,KAAK,SAAS;gBACjC,CAAC,UAAU,CAAC,MAAM;gBAClB,CAAC,qBAAqB,CAAC,MAAM;gBAC7B,YAAY,CAAC,MAAM,KAAK,SAAS,EACjC,CAAC;gBACD,OAAO,SAAS,CAAA;YAClB,CAAC;YAED,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,uBAAuB,CAAC;gBAClD,IAAI,EAAE,UAAU,CAAC,MAAM;gBACvB,OAAO,EAAE,aAAa,CAAC,MAAM,IAAI,GAAG;gBACpC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC;gBACxB,iBAAiB,EAAE,YAAY;gBAC/B,eAAe,EAAE,qBAAqB,CAAC,MAAM;aAC9C,CAAC,CAAA;YAEF,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,SAAS,CAAA;YAClB,CAAC;YAED,MAAM,OAAO,GAAG;gBACd,KAAK,EAAE,MAAM,CAAC,OAAQ,CAAC,OAAO;gBAC9B,OAAO,EAAE,cAAc;gBACvB,KAAK,EAAE,MAAM;gBACb,KAAK,EAAE,YAAY,CAAC,MAAM;gBAC1B,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,aAAa;aACzE,CAAA;YAED,OAAO;gBACL,WAAW,EAAE,QAAQ;gBACrB,MAAM;gBACN,KAAK,EAAE,YAAY;gBACnB,OAAO;aACR,CAAA;QACH,CAAC;QAED,MAAM,CAAC,UAAU,EAAE,qBAAqB,EAAE,YAAY,EAAE,aAAa,CAAC,GACpE,CAAC,MAAM,OAAO,CAAC,UAAU,CACvB,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CACxD,CAKA,CAAA;QAEH,IACE,UAAU,CAAC,MAAM,KAAK,WAAW;YACjC,qBAAqB,CAAC,MAAM,KAAK,WAAW;YAC5C,YAAY,CAAC,MAAM,KAAK,WAAW,EACnC,CAAC;YACD,OAAO,SAAS,CAAA;QAClB,CAAC;QAED,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAA;QAC7B,MAAM,OAAO,GACX,aAAa,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAA;QAClE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,uBAAuB,CAAC;YAClD,IAAI;YACJ,OAAO;YACP,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC;YACxB,iBAAiB,EAAE,YAAY;YAC/B,eAAe,EAAE,qBAAqB,CAAC,KAAK;SAC7C,CAAC,CAAA;QAEF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,SAAS,CAAA;QAClB,CAAC;QAED,MAAM,OAAO,GAAG;YACd,KAAK,EAAE,MAAM,CAAC,OAAQ,CAAC,OAAO;YAC9B,OAAO,EAAE,cAAc;YACvB,KAAK,EAAE,MAAM;YACb,KAAK,EAAE,YAAY,CAAC,KAAK;YACzB,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,aAAa;SACzE,CAAA;QAED,OAAO;YACL,WAAW,EAAE,QAAQ;YACrB,MAAM;YACN,KAAK,EAAE,YAAY;YACnB,OAAO;SACR,CAAA;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC,CAAA"}
|
|
@@ -2,40 +2,41 @@ import { keccak256 } from 'viem';
|
|
|
2
2
|
import { signTypedData } from 'viem/actions';
|
|
3
3
|
import { getAction } from 'viem/utils';
|
|
4
4
|
import { getPermitTransferFromValues } from './getPermitTransferFromValues.js';
|
|
5
|
-
import { getPermitData
|
|
5
|
+
import { getPermitData } from './signatureTransfer.js';
|
|
6
6
|
export async function signPermit2Message(params) {
|
|
7
|
-
const { client, chain, tokenAddress, amount, data,
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
7
|
+
const { client, chain, tokenAddress, amount, data, witness } = params;
|
|
8
|
+
const permitTransferFrom = await getPermitTransferFromValues(client, chain, tokenAddress, amount);
|
|
9
|
+
// Create witness data for the LI.FI call
|
|
10
|
+
const _witness = witness
|
|
11
|
+
? {
|
|
12
|
+
witness: {
|
|
13
|
+
diamondAddress: chain.diamondAddress,
|
|
14
|
+
diamondCalldataHash: keccak256(data),
|
|
15
|
+
},
|
|
16
|
+
witnessTypeName: 'LiFiCall',
|
|
17
|
+
witnessType: {
|
|
18
|
+
LiFiCall: [
|
|
19
|
+
{ name: 'diamondAddress', type: 'address' },
|
|
20
|
+
{ name: 'diamondCalldataHash', type: 'bytes32' },
|
|
21
|
+
],
|
|
22
|
+
},
|
|
23
|
+
}
|
|
24
|
+
: undefined;
|
|
25
|
+
const permitData = getPermitData(permitTransferFrom, chain.permit2, chain.id, _witness);
|
|
26
|
+
const primaryType = witness
|
|
27
|
+
? 'PermitWitnessTransferFrom'
|
|
28
|
+
: 'PermitTransferFrom';
|
|
29
29
|
const signature = await getAction(client, signTypedData, 'signTypedData')({
|
|
30
30
|
account: client.account,
|
|
31
|
-
primaryType
|
|
32
|
-
domain:
|
|
33
|
-
types:
|
|
34
|
-
message:
|
|
31
|
+
primaryType,
|
|
32
|
+
domain: permitData.domain,
|
|
33
|
+
types: permitData.types,
|
|
34
|
+
message: permitData.message,
|
|
35
35
|
});
|
|
36
36
|
return {
|
|
37
|
+
...permitData,
|
|
38
|
+
primaryType,
|
|
37
39
|
signature,
|
|
38
|
-
values: _permitData.values,
|
|
39
40
|
};
|
|
40
41
|
}
|
|
41
42
|
//# sourceMappingURL=signPermit2Message.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signPermit2Message.js","sourceRoot":"","sources":["../../../../core/EVM/permits/signPermit2Message.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAA;AAC9E,OAAO,
|
|
1
|
+
{"version":3,"file":"signPermit2Message.js","sourceRoot":"","sources":["../../../../core/EVM/permits/signPermit2Message.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAA;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAWtD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAAgC;IAEhC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,CAAA;IAErE,MAAM,kBAAkB,GAAG,MAAM,2BAA2B,CAC1D,MAAM,EACN,KAAK,EACL,YAAY,EACZ,MAAM,CACP,CAAA;IAED,yCAAyC;IACzC,MAAM,QAAQ,GAAG,OAAO;QACtB,CAAC,CAAC;YACE,OAAO,EAAE;gBACP,cAAc,EAAE,KAAK,CAAC,cAAyB;gBAC/C,mBAAmB,EAAE,SAAS,CAAC,IAAI,CAAC;aACrC;YACD,eAAe,EAAE,UAAU;YAC3B,WAAW,EAAE;gBACX,QAAQ,EAAE;oBACR,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,SAAS,EAAE;oBAC3C,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAE,SAAS,EAAE;iBACjD;aACF;SACF;QACH,CAAC,CAAC,SAAS,CAAA;IAEb,MAAM,UAAU,GAAG,aAAa,CAC9B,kBAAkB,EAClB,KAAK,CAAC,OAAkB,EACxB,KAAK,CAAC,EAAE,EACR,QAAQ,CACT,CAAA;IAED,MAAM,WAAW,GAAG,OAAO;QACzB,CAAC,CAAC,2BAA2B;QAC7B,CAAC,CAAC,oBAAoB,CAAA;IAExB,MAAM,SAAS,GAAG,MAAM,SAAS,CAC/B,MAAM,EACN,aAAa,EACb,eAAe,CAChB,CAAC;QACA,OAAO,EAAE,MAAM,CAAC,OAAQ;QACxB,WAAW;QACX,MAAM,EAAE,UAAU,CAAC,MAAM;QACzB,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,OAAO,EAAE,UAAU,CAAC,OAAO;KAC5B,CAAC,CAAA;IAEF,OAAO;QACL,GAAG,UAAU;QACb,WAAW;QACX,SAAS;KACV,CAAA;AACH,CAAC"}
|
|
@@ -45,13 +45,13 @@ export function getPermitTransferData(permit, permit2Address, chainId, witness)
|
|
|
45
45
|
],
|
|
46
46
|
}
|
|
47
47
|
: PERMIT_TRANSFER_FROM_TYPES;
|
|
48
|
-
const
|
|
48
|
+
const message = witness
|
|
49
49
|
? Object.assign(permit, { witness: witness.witness })
|
|
50
50
|
: permit;
|
|
51
51
|
return {
|
|
52
52
|
domain,
|
|
53
53
|
types,
|
|
54
|
-
|
|
54
|
+
message,
|
|
55
55
|
};
|
|
56
56
|
}
|
|
57
57
|
export function getPermitBatchTransferData(permit, permit2Address, chainId, witness) {
|
|
@@ -72,13 +72,13 @@ export function getPermitBatchTransferData(permit, permit2Address, chainId, witn
|
|
|
72
72
|
],
|
|
73
73
|
}
|
|
74
74
|
: PERMIT_BATCH_TRANSFER_FROM_TYPES;
|
|
75
|
-
const
|
|
75
|
+
const message = witness
|
|
76
76
|
? Object.assign(permit, { witness: witness.witness })
|
|
77
77
|
: permit;
|
|
78
78
|
return {
|
|
79
79
|
domain,
|
|
80
80
|
types,
|
|
81
|
-
|
|
81
|
+
message,
|
|
82
82
|
};
|
|
83
83
|
}
|
|
84
84
|
export function getPermitData(permit, permit2Address, chainId, witness) {
|
|
@@ -89,24 +89,24 @@ export function getPermitData(permit, permit2Address, chainId, witness) {
|
|
|
89
89
|
}
|
|
90
90
|
export function hash(permit, permit2Address, chainId, witness) {
|
|
91
91
|
if (isPermitTransferFrom(permit)) {
|
|
92
|
-
const { domain, types,
|
|
92
|
+
const { domain, types, message } = getPermitTransferData(permit, permit2Address, chainId, witness);
|
|
93
93
|
return hashTypedData({
|
|
94
94
|
domain,
|
|
95
95
|
types,
|
|
96
96
|
primaryType: witness ? 'PermitWitnessTransferFrom' : 'PermitTransferFrom',
|
|
97
97
|
message: {
|
|
98
|
-
...
|
|
98
|
+
...message,
|
|
99
99
|
},
|
|
100
100
|
});
|
|
101
101
|
}
|
|
102
|
-
const { domain, types,
|
|
102
|
+
const { domain, types, message } = getPermitBatchTransferData(permit, permit2Address, chainId, witness);
|
|
103
103
|
return hashTypedData({
|
|
104
104
|
domain,
|
|
105
105
|
types,
|
|
106
106
|
primaryType: witness
|
|
107
107
|
? 'PermitBatchWitnessTransferFrom'
|
|
108
108
|
: 'PermitBatchTransferFrom',
|
|
109
|
-
message: { ...
|
|
109
|
+
message: { ...message },
|
|
110
110
|
});
|
|
111
111
|
}
|
|
112
112
|
function validateTokenPermissions(permissions) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signatureTransfer.js","sourceRoot":"","sources":["../../../../core/EVM/permits/signatureTransfer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAA;AAEpC,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EACL,cAAc,EACd,0BAA0B,EAC1B,iBAAiB,GAClB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAuC3C,MAAM,iBAAiB,GAAG;IACxB,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;IAClC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;CAC3B,CAAA;AAEV,MAAM,0BAA0B,GAAG;IACjC,gBAAgB,EAAE,iBAAiB;IACnC,kBAAkB,EAAE;QAClB,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,kBAAkB,EAAE;QAC/C,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;QACpC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;QAClC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;KACtC;CACO,CAAA;AAEV,MAAM,gCAAgC,GAAG;IACvC,gBAAgB,EAAE,iBAAiB;IACnC,uBAAuB,EAAE;QACvB,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,oBAAoB,EAAE;QACjD,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;QACpC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;QAClC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;KACtC;CACO,CAAA;AAEV,SAAS,oBAAoB,CAC3B,MAAoD;IAEpD,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;AACzC,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,MAA0B,EAC1B,cAAuB,EACvB,OAAe,EACf,OAAiB;IAEjB,SAAS,CAAC,cAAc,IAAI,MAAM,CAAC,QAAQ,EAAE,2BAA2B,CAAC,CAAA;IACzE,SAAS,CAAC,iBAAiB,IAAI,MAAM,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAA;IAElE,MAAM,MAAM,GAAG,aAAa,CAAC,cAAc,EAAE,OAAO,CAAC,CAAA;IAErD,wBAAwB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IAE1C,MAAM,KAAK,GAAG,OAAO;QACnB,CAAC,CAAE;YACC,gBAAgB,EAAE,iBAAiB;YACnC,GAAG,OAAO,CAAC,WAAW;YACtB,yBAAyB,EAAE;gBACzB,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,kBAAkB,EAAE;gBAC/C,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;gBACpC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;gBAClC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;gBACrC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,eAAe,EAAE;aACnD;SACQ;QACb,CAAC,CAAC,0BAA0B,CAAA;IAE9B,MAAM,
|
|
1
|
+
{"version":3,"file":"signatureTransfer.js","sourceRoot":"","sources":["../../../../core/EVM/permits/signatureTransfer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
export function isRelayerStep(step) {
|
|
2
|
-
|
|
3
|
-
|
|
2
|
+
return !!step.typedData && step.typedData.length > 0;
|
|
3
|
+
}
|
|
4
|
+
export function isGaslessStep(step) {
|
|
5
|
+
return !!step.typedData?.find((p) => p.primaryType === 'PermitWitnessTransferFrom');
|
|
4
6
|
}
|
|
5
7
|
//# sourceMappingURL=typeguards.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeguards.js","sourceRoot":"","sources":["../../../core/EVM/typeguards.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"typeguards.js","sourceRoot":"","sources":["../../../core/EVM/typeguards.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,aAAa,CAC3B,IAAiC;IAEjC,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;AACtD,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,IAAiC;IAEjC,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAC3B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,2BAA2B,CACrD,CAAA;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../core/EVM/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,SAAS,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../core/EVM/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,SAAS,EAAE,MAAM,aAAa,CAAA;AAiBvD,MAAM,UAAU,KAAK,CAAC,QAAqB;IACzC,OAAO,QAAQ,CAAC,IAAI,KAAK,SAAS,CAAC,GAAG,CAAA;AACxC,CAAC"}
|
|
@@ -8,48 +8,23 @@ export const KeypairWalletName = 'Keypair Wallet';
|
|
|
8
8
|
* Wallet Adapter without using a third-party wallet.
|
|
9
9
|
*/
|
|
10
10
|
export class KeypairWalletAdapter extends BaseSignerWalletAdapter {
|
|
11
|
+
name = KeypairWalletName;
|
|
12
|
+
url = 'https://github.com/anza-xyz/wallet-adapter';
|
|
13
|
+
icon = '';
|
|
14
|
+
supportedTransactionVersions = new Set([
|
|
15
|
+
'legacy',
|
|
16
|
+
0,
|
|
17
|
+
]);
|
|
18
|
+
/**
|
|
19
|
+
* Storing a keypair locally like this is not safe because any application using this adapter could retrieve the
|
|
20
|
+
* secret key, and because the keypair will be lost any time the wallet is disconnected or the window is refreshed.
|
|
21
|
+
*/
|
|
22
|
+
_keypair;
|
|
11
23
|
constructor(privateKey) {
|
|
12
24
|
if (!privateKey) {
|
|
13
25
|
throw new WalletConfigError();
|
|
14
26
|
}
|
|
15
27
|
super();
|
|
16
|
-
Object.defineProperty(this, "name", {
|
|
17
|
-
enumerable: true,
|
|
18
|
-
configurable: true,
|
|
19
|
-
writable: true,
|
|
20
|
-
value: KeypairWalletName
|
|
21
|
-
});
|
|
22
|
-
Object.defineProperty(this, "url", {
|
|
23
|
-
enumerable: true,
|
|
24
|
-
configurable: true,
|
|
25
|
-
writable: true,
|
|
26
|
-
value: 'https://github.com/anza-xyz/wallet-adapter'
|
|
27
|
-
});
|
|
28
|
-
Object.defineProperty(this, "icon", {
|
|
29
|
-
enumerable: true,
|
|
30
|
-
configurable: true,
|
|
31
|
-
writable: true,
|
|
32
|
-
value: ''
|
|
33
|
-
});
|
|
34
|
-
Object.defineProperty(this, "supportedTransactionVersions", {
|
|
35
|
-
enumerable: true,
|
|
36
|
-
configurable: true,
|
|
37
|
-
writable: true,
|
|
38
|
-
value: new Set([
|
|
39
|
-
'legacy',
|
|
40
|
-
0,
|
|
41
|
-
])
|
|
42
|
-
});
|
|
43
|
-
/**
|
|
44
|
-
* Storing a keypair locally like this is not safe because any application using this adapter could retrieve the
|
|
45
|
-
* secret key, and because the keypair will be lost any time the wallet is disconnected or the window is refreshed.
|
|
46
|
-
*/
|
|
47
|
-
Object.defineProperty(this, "_keypair", {
|
|
48
|
-
enumerable: true,
|
|
49
|
-
configurable: true,
|
|
50
|
-
writable: true,
|
|
51
|
-
value: void 0
|
|
52
|
-
});
|
|
53
28
|
this._keypair = Keypair.fromSecretKey(bs58.decode(privateKey));
|
|
54
29
|
}
|
|
55
30
|
get connecting() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KeypairWalletAdapter.js","sourceRoot":"","sources":["../../../core/Solana/KeypairWalletAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAK/C,OAAO,EACL,uBAAuB,EACvB,iBAAiB,EACjB,uBAAuB,EACvB,gBAAgB,EAChB,sBAAsB,GACvB,MAAM,6BAA6B,CAAA;AAMpC,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACzC,OAAO,IAAI,MAAM,MAAM,CAAA;AAEvB,MAAM,CAAC,MAAM,iBAAiB,GAC5B,gBAAgD,CAAA;AAElD;;;GAGG;AACH,MAAM,OAAO,oBACX,SAAQ,uBAAuB;
|
|
1
|
+
{"version":3,"file":"KeypairWalletAdapter.js","sourceRoot":"","sources":["../../../core/Solana/KeypairWalletAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAK/C,OAAO,EACL,uBAAuB,EACvB,iBAAiB,EACjB,uBAAuB,EACvB,gBAAgB,EAChB,sBAAsB,GACvB,MAAM,6BAA6B,CAAA;AAMpC,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACzC,OAAO,IAAI,MAAM,MAAM,CAAA;AAEvB,MAAM,CAAC,MAAM,iBAAiB,GAC5B,gBAAgD,CAAA;AAElD;;;GAGG;AACH,MAAM,OAAO,oBACX,SAAQ,uBAAuB;IAG/B,IAAI,GAAG,iBAAiB,CAAA;IACxB,GAAG,GAAG,4CAA4C,CAAA;IAClD,IAAI,GAAG,EAAE,CAAA;IACT,4BAA4B,GAAoC,IAAI,GAAG,CAAC;QACtE,QAAQ;QACR,CAAC;KACF,CAAC,CAAA;IAEF;;;OAGG;IACK,QAAQ,CAAqB;IAErC,YAAY,UAAkB;QAC5B,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,iBAAiB,EAAE,CAAA;QAC/B,CAAC;QACD,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAA;IAChE,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,KAAK,CAAA;IACd,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,QAAQ,EAAE,SAAS,IAAI,IAAI,CAAA;IACzC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,gBAAgB,CAAC,QAAQ,CAAA;IAClC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,UAAmB;QAC/B,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,iBAAiB,EAAE,CAAA;QAC/B,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAA;IAChE,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAA;IAC3B,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,WAAc;QAEd,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,uBAAuB,EAAE,CAAA;QACrC,CAAC;QAED,IAAI,sBAAsB,CAAC,WAAW,CAAC,EAAE,CAAC;YACxC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;QACnC,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACxC,CAAC;QAED,OAAO,WAAW,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAmB;QACnC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,uBAAuB,EAAE,CAAA;QACrC,CAAC;QAED,OAAO,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;IACpE,CAAC;CACF"}
|