@1stdex/first-sdk 1.0.8 → 1.0.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/calls/batch/prepare-order-with-setup.js +6 -5
- package/dist/cjs/calls/batch/prepare-order-with-setup.js.map +1 -1
- package/dist/cjs/calls/market/limit.js +3 -6
- package/dist/cjs/calls/market/limit.js.map +1 -1
- package/dist/cjs/utils/build-transaction.js +11 -1
- package/dist/cjs/utils/build-transaction.js.map +1 -1
- package/dist/esm/calls/batch/prepare-order-with-setup.js +7 -4
- package/dist/esm/calls/batch/prepare-order-with-setup.js.map +1 -1
- package/dist/esm/calls/market/limit.js +3 -6
- package/dist/esm/calls/market/limit.js.map +1 -1
- package/dist/esm/utils/build-transaction.js +12 -1
- package/dist/esm/utils/build-transaction.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/types/calls/batch/prepare-order-with-setup.d.ts.map +1 -1
- package/dist/types/calls/market/limit.d.ts +1 -0
- package/dist/types/calls/market/limit.d.ts.map +1 -1
- package/dist/types/utils/build-transaction.d.ts +1 -1
- package/dist/types/utils/build-transaction.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -2,19 +2,18 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.prepareOrderWithSetup = void 0;
|
|
4
4
|
const viem_1 = require("viem");
|
|
5
|
+
const chain_1 = require("../../constants/chain-configs/chain");
|
|
5
6
|
const addresses_1 = require("../../constants/chain-configs/addresses");
|
|
6
7
|
const book_manager_abi_1 = require("../../constants/abis/core/book-manager-abi");
|
|
7
8
|
const setup_1 = require("../../views/setup");
|
|
8
9
|
const vault_1 = require("../../views/vault");
|
|
9
10
|
const apis_1 = require("../../entities/currency/apis");
|
|
10
|
-
const viem_2 = require("viem");
|
|
11
|
-
const chain_1 = require("../../constants/chain-configs/chain");
|
|
12
|
-
const limit_1 = require("../market/limit");
|
|
13
11
|
const deposit_to_vault_1 = require("../vault/deposit-to-vault");
|
|
12
|
+
const limit_1 = require("../market/limit");
|
|
14
13
|
const prepareOrderWithSetup = async ({ chainId, userAddress, inputToken, outputToken, amount, price, options, }) => {
|
|
15
|
-
const publicClient = (0,
|
|
14
|
+
const publicClient = (0, viem_1.createPublicClient)({
|
|
16
15
|
chain: chain_1.CHAIN_MAP[chainId],
|
|
17
|
-
transport: options?.rpcUrl ? (0,
|
|
16
|
+
transport: options?.rpcUrl ? (0, viem_1.http)(options.rpcUrl) : (0, viem_1.http)(),
|
|
18
17
|
});
|
|
19
18
|
const controllerAddress = addresses_1.CONTRACT_ADDRESSES[chainId].Controller;
|
|
20
19
|
const bookManagerAddress = addresses_1.CONTRACT_ADDRESSES[chainId].BookManager;
|
|
@@ -94,6 +93,7 @@ const prepareOrderWithSetup = async ({ chainId, userAddress, inputToken, outputT
|
|
|
94
93
|
value: depositTx.value,
|
|
95
94
|
});
|
|
96
95
|
}
|
|
96
|
+
const hasSetupCalls = calls.length > 0;
|
|
97
97
|
const { transaction } = await (0, limit_1.limitOrder)({
|
|
98
98
|
chainId,
|
|
99
99
|
userAddress,
|
|
@@ -104,6 +104,7 @@ const prepareOrderWithSetup = async ({ chainId, userAddress, inputToken, outputT
|
|
|
104
104
|
options: {
|
|
105
105
|
...options,
|
|
106
106
|
useSubgraph: false,
|
|
107
|
+
skipGasEstimation: hasSetupCalls,
|
|
107
108
|
},
|
|
108
109
|
});
|
|
109
110
|
calls.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare-order-with-setup.js","sourceRoot":"","sources":["../../../../src/calls/batch/prepare-order-with-setup.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"prepare-order-with-setup.js","sourceRoot":"","sources":["../../../../src/calls/batch/prepare-order-with-setup.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,10 +61,7 @@ const limitOrder = async ({ chainId, userAddress, inputToken, outputToken, amoun
|
|
|
61
61
|
inputToken,
|
|
62
62
|
outputToken,
|
|
63
63
|
amountIn: amount,
|
|
64
|
-
options: {
|
|
65
|
-
...options,
|
|
66
|
-
limitPrice: price,
|
|
67
|
-
},
|
|
64
|
+
options: { ...options, limitPrice: price },
|
|
68
65
|
});
|
|
69
66
|
const isETH = (0, viem_1.isAddressEqual)(inputToken, viem_1.zeroAddress);
|
|
70
67
|
const makeParam = {
|
|
@@ -91,7 +88,7 @@ const limitOrder = async ({ chainId, userAddress, inputToken, outputToken, amoun
|
|
|
91
88
|
functionName: 'make',
|
|
92
89
|
args: [[makeParam], [], (0, time_1.getDeadlineTimestampInSeconds)()],
|
|
93
90
|
value: isETH ? quoteAmount : 0n,
|
|
94
|
-
}, options?.gasLimit),
|
|
91
|
+
}, options?.gasLimit, undefined, options?.skipGasEstimation),
|
|
95
92
|
result: {
|
|
96
93
|
make: {
|
|
97
94
|
amount: (0, viem_1.formatUnits)(quoteAmount, inputCurrency.decimals),
|
|
@@ -151,7 +148,7 @@ const limitOrder = async ({ chainId, userAddress, inputToken, outputToken, amoun
|
|
|
151
148
|
(0, time_1.getDeadlineTimestampInSeconds)(),
|
|
152
149
|
],
|
|
153
150
|
value: isETH ? quoteAmount : 0n,
|
|
154
|
-
}, options?.gasLimit),
|
|
151
|
+
}, options?.gasLimit, undefined, options?.skipGasEstimation),
|
|
155
152
|
result: {
|
|
156
153
|
make: {
|
|
157
154
|
amount: (0, viem_1.formatUnits)(quoteAmount - (0, viem_1.parseUnits)(spentAmount, inputCurrency.decimals), inputCurrency.decimals),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"limit.js","sourceRoot":"","sources":["../../../../src/calls/market/limit.ts"],"names":[],"mappings":";;;AAAA,+BASc;AAEd,+DAA2E;AAO3E,qDAAyD;AACzD,uCAA2E;AAC3E,qDAA0D;AAC1D,uCAAgD;AAChD,+DAA6D;AAC7D,qEAAiE;AACjE,uEAA6E;AAC7E,6EAA0E;AAC1E,2CAAiE;AA+C1D,MAAM,UAAU,GAAG,KAAK,EAAE,EAC/B,OAAO,EACP,WAAW,EACX,UAAU,EACV,WAAW,EACX,MAAM,EACN,KAAK,EACL,OAAO,
|
|
1
|
+
{"version":3,"file":"limit.js","sourceRoot":"","sources":["../../../../src/calls/market/limit.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,18 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.buildTransaction = void 0;
|
|
4
4
|
const viem_1 = require("viem");
|
|
5
|
-
const buildTransaction = async (publicClient, args, gasLimit, gasPriceLimit) => {
|
|
5
|
+
const buildTransaction = async (publicClient, args, gasLimit, gasPriceLimit, skipGasEstimation) => {
|
|
6
6
|
const data = (0, viem_1.encodeFunctionData)(args);
|
|
7
|
+
if (skipGasEstimation) {
|
|
8
|
+
return {
|
|
9
|
+
gas: gasLimit || 0n,
|
|
10
|
+
gasPrice: gasPriceLimit || 0n,
|
|
11
|
+
data,
|
|
12
|
+
value: args.value || 0n,
|
|
13
|
+
to: args.address,
|
|
14
|
+
from: args.account,
|
|
15
|
+
};
|
|
16
|
+
}
|
|
7
17
|
const [gas, gasPrice] = await Promise.all([
|
|
8
18
|
gasLimit ??
|
|
9
19
|
publicClient.estimateGas({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-transaction.js","sourceRoot":"","sources":["../../../src/utils/build-transaction.ts"],"names":[],"mappings":";;;AAAA,+BAKc;AAIP,MAAM,gBAAgB,GAAG,KAAK,EACnC,YAA0B,EAC1B,IAA0D,EAC1D,QAAiB,EACjB,aAAsB,
|
|
1
|
+
{"version":3,"file":"build-transaction.js","sourceRoot":"","sources":["../../../src/utils/build-transaction.ts"],"names":[],"mappings":";;;AAAA,+BAKc;AAIP,MAAM,gBAAgB,GAAG,KAAK,EACnC,YAA0B,EAC1B,IAA0D,EAC1D,QAAiB,EACjB,aAAsB,EACtB,iBAA2B,EACL,EAAE;IACxB,MAAM,IAAI,GAAG,IAAA,yBAAkB,EAAC,IAAI,CAAC,CAAC;IAEtC,IAAI,iBAAiB,EAAE,CAAC;QAEtB,OAAO;YACL,GAAG,EAAE,QAAQ,IAAI,EAAE;YACnB,QAAQ,EAAE,aAAa,IAAI,EAAE;YAC7B,IAAI;YACJ,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;YACvB,EAAE,EAAE,IAAI,CAAC,OAAO;YAChB,IAAI,EAAE,IAAI,CAAC,OAAQ;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACxC,QAAQ;YACN,YAAY,CAAC,WAAW,CAAC;gBACvB,OAAO,EAAE,IAAI,CAAC,OAAQ;gBACtB,IAAI;gBACJ,EAAE,EAAE,IAAI,CAAC,OAAO;gBAChB,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;aACxB,CAAC;QACJ,aAAa,IAAI,YAAY,CAAC,WAAW,EAAE;KAC5C,CAAC,CAAC;IACH,OAAO;QACL,GAAG;QACH,QAAQ;QACR,IAAI;QACJ,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;QACvB,EAAE,EAAE,IAAI,CAAC,OAAO;QAChB,IAAI,EAAE,IAAI,CAAC,OAAQ;KACpB,CAAC;AACJ,CAAC,CAAC;AAvCW,QAAA,gBAAgB,oBAuC3B"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
|
-
import { encodeFunctionData, erc20Abi, parseUnits } from 'viem';
|
|
1
|
+
import { createPublicClient, http, encodeFunctionData, erc20Abi, parseUnits, } from 'viem';
|
|
2
|
+
import { CHAIN_MAP } from '../../constants/chain-configs/chain';
|
|
2
3
|
import { CONTRACT_ADDRESSES } from '../../constants/chain-configs/addresses';
|
|
3
4
|
import { BOOK_MANAGER_ABI } from '../../constants/abis/core/book-manager-abi';
|
|
4
5
|
import { getOrderSetupStatus } from '../../views/setup';
|
|
5
6
|
import { getVault } from '../../views/vault';
|
|
6
7
|
import { fetchCurrency } from '../../entities/currency/apis';
|
|
7
|
-
import { createPublicClient, http } from 'viem';
|
|
8
|
-
import { CHAIN_MAP } from '../../constants/chain-configs/chain';
|
|
9
|
-
import { limitOrder } from '../market/limit';
|
|
10
8
|
import { depositToVault } from '../vault/deposit-to-vault';
|
|
9
|
+
import { limitOrder } from '../market/limit';
|
|
11
10
|
/**
|
|
12
11
|
* Prepares all necessary transactions for placing an order, including setup if needed.
|
|
13
12
|
* Checks current state and only includes transactions for missing setup steps.
|
|
@@ -126,6 +125,9 @@ export const prepareOrderWithSetup = async ({ chainId, userAddress, inputToken,
|
|
|
126
125
|
});
|
|
127
126
|
}
|
|
128
127
|
// 4. Limit order
|
|
128
|
+
// Only skip gas estimation if we have setup calls (batch scenario)
|
|
129
|
+
// If no setup needed, estimate gas normally for better error messages
|
|
130
|
+
const hasSetupCalls = calls.length > 0;
|
|
129
131
|
const { transaction } = await limitOrder({
|
|
130
132
|
chainId,
|
|
131
133
|
userAddress,
|
|
@@ -136,6 +138,7 @@ export const prepareOrderWithSetup = async ({ chainId, userAddress, inputToken,
|
|
|
136
138
|
options: {
|
|
137
139
|
...options,
|
|
138
140
|
useSubgraph: false,
|
|
141
|
+
skipGasEstimation: hasSetupCalls,
|
|
139
142
|
},
|
|
140
143
|
});
|
|
141
144
|
calls.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare-order-with-setup.js","sourceRoot":"","sources":["../../../../src/calls/batch/prepare-order-with-setup.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"prepare-order-with-setup.js","sourceRoot":"","sources":["../../../../src/calls/batch/prepare-order-with-setup.ts"],"names":[],"mappings":"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"}
|
|
@@ -103,10 +103,7 @@ export const limitOrder = async ({ chainId, userAddress, inputToken, outputToken
|
|
|
103
103
|
inputToken,
|
|
104
104
|
outputToken,
|
|
105
105
|
amountIn: amount,
|
|
106
|
-
options: {
|
|
107
|
-
...options,
|
|
108
|
-
limitPrice: price,
|
|
109
|
-
},
|
|
106
|
+
options: { ...options, limitPrice: price },
|
|
110
107
|
});
|
|
111
108
|
const isETH = isAddressEqual(inputToken, zeroAddress);
|
|
112
109
|
const makeParam = {
|
|
@@ -133,7 +130,7 @@ export const limitOrder = async ({ chainId, userAddress, inputToken, outputToken
|
|
|
133
130
|
functionName: 'make',
|
|
134
131
|
args: [[makeParam], [], getDeadlineTimestampInSeconds()],
|
|
135
132
|
value: isETH ? quoteAmount : 0n,
|
|
136
|
-
}, options?.gasLimit),
|
|
133
|
+
}, options?.gasLimit, undefined, options?.skipGasEstimation),
|
|
137
134
|
result: {
|
|
138
135
|
make: {
|
|
139
136
|
amount: formatUnits(quoteAmount, inputCurrency.decimals),
|
|
@@ -194,7 +191,7 @@ export const limitOrder = async ({ chainId, userAddress, inputToken, outputToken
|
|
|
194
191
|
getDeadlineTimestampInSeconds(),
|
|
195
192
|
],
|
|
196
193
|
value: isETH ? quoteAmount : 0n,
|
|
197
|
-
}, options?.gasLimit),
|
|
194
|
+
}, options?.gasLimit, undefined, options?.skipGasEstimation),
|
|
198
195
|
result: {
|
|
199
196
|
make: {
|
|
200
197
|
amount: formatUnits(quoteAmount - parseUnits(spentAmount, inputCurrency.decimals), inputCurrency.decimals),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"limit.js","sourceRoot":"","sources":["../../../../src/calls/market/limit.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,UAAU,EACV,IAAI,EACJ,SAAS,EACT,cAAc,EACd,UAAU,EACV,WAAW,GACZ,MAAM,MAAM,CAAC;AAEd,OAAO,EAAa,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAO3E,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AAEjE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAAE,EAC/B,OAAO,EACP,WAAW,EACX,UAAU,EACV,WAAW,EACX,MAAM,EACN,KAAK,EACL,OAAO,
|
|
1
|
+
{"version":3,"file":"limit.js","sourceRoot":"","sources":["../../../../src/calls/market/limit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,17 @@
|
|
|
1
1
|
import { encodeFunctionData, } from 'viem';
|
|
2
|
-
export const buildTransaction = async (publicClient, args, gasLimit, gasPriceLimit) => {
|
|
2
|
+
export const buildTransaction = async (publicClient, args, gasLimit, gasPriceLimit, skipGasEstimation) => {
|
|
3
3
|
const data = encodeFunctionData(args);
|
|
4
|
+
if (skipGasEstimation) {
|
|
5
|
+
// Skip gas estimation - used for batched calls where gas is estimated for entire batch
|
|
6
|
+
return {
|
|
7
|
+
gas: gasLimit || 0n,
|
|
8
|
+
gasPrice: gasPriceLimit || 0n,
|
|
9
|
+
data,
|
|
10
|
+
value: args.value || 0n,
|
|
11
|
+
to: args.address,
|
|
12
|
+
from: args.account,
|
|
13
|
+
};
|
|
14
|
+
}
|
|
4
15
|
const [gas, gasPrice] = await Promise.all([
|
|
5
16
|
gasLimit ??
|
|
6
17
|
publicClient.estimateGas({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-transaction.js","sourceRoot":"","sources":["../../../src/utils/build-transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,GAInB,MAAM,MAAM,CAAC;AAId,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,YAA0B,EAC1B,IAA0D,EAC1D,QAAiB,EACjB,aAAsB,
|
|
1
|
+
{"version":3,"file":"build-transaction.js","sourceRoot":"","sources":["../../../src/utils/build-transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,GAInB,MAAM,MAAM,CAAC;AAId,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,YAA0B,EAC1B,IAA0D,EAC1D,QAAiB,EACjB,aAAsB,EACtB,iBAA2B,EACL,EAAE;IACxB,MAAM,IAAI,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAEtC,IAAI,iBAAiB,EAAE,CAAC;QACtB,uFAAuF;QACvF,OAAO;YACL,GAAG,EAAE,QAAQ,IAAI,EAAE;YACnB,QAAQ,EAAE,aAAa,IAAI,EAAE;YAC7B,IAAI;YACJ,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;YACvB,EAAE,EAAE,IAAI,CAAC,OAAO;YAChB,IAAI,EAAE,IAAI,CAAC,OAAQ;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACxC,QAAQ;YACN,YAAY,CAAC,WAAW,CAAC;gBACvB,OAAO,EAAE,IAAI,CAAC,OAAQ;gBACtB,IAAI;gBACJ,EAAE,EAAE,IAAI,CAAC,OAAO;gBAChB,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;aACxB,CAAC;QACJ,aAAa,IAAI,YAAY,CAAC,WAAW,EAAE;KAC5C,CAAC,CAAC;IACH,OAAO;QACL,GAAG;QACH,QAAQ;QACR,IAAI;QACJ,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;QACvB,EAAE,EAAE,IAAI,CAAC,OAAO;QAChB,IAAI,EAAE,IAAI,CAAC,OAAQ;KACpB,CAAC;AACJ,CAAC,CAAC"}
|