@1stdex/first-sdk 1.0.92 → 1.0.93-beta.1

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.
@@ -41,9 +41,11 @@ const approveAllForMarket = async ({ chainId, walletClient, token0, token1, opti
41
41
  const oneMillionQuote = 10n ** BigInt(quoteCurrency.decimals) * 1000000n;
42
42
  const baseThreshold = maxValue - oneMillionBase;
43
43
  const quoteThreshold = maxValue - oneMillionQuote;
44
- const [baseToControllerAllowance, quoteToControllerAllowance, baseVaultToBookManagerAllowance, quoteVaultToBookManagerAllowance,] = await Promise.all([
44
+ const [baseToControllerAllowance, quoteToControllerAllowance, baseVaultToControllerAllowance, quoteVaultToControllerAllowance, baseVaultToBookManagerAllowance, quoteVaultToBookManagerAllowance,] = await Promise.all([
45
45
  (0, allowance_1.fetchAllowance)(publicClient, baseTokenAddress, walletClient.account.address, controllerAddress),
46
46
  (0, allowance_1.fetchAllowance)(publicClient, quoteTokenAddress, walletClient.account.address, controllerAddress),
47
+ (0, allowance_1.fetchAllowance)(publicClient, baseVault.address, walletClient.account.address, controllerAddress),
48
+ (0, allowance_1.fetchAllowance)(publicClient, quoteVault.address, walletClient.account.address, controllerAddress),
47
49
  (0, allowance_1.fetchAllowance)(publicClient, baseVault.address, walletClient.account.address, bookManagerAddress),
48
50
  (0, allowance_1.fetchAllowance)(publicClient, quoteVault.address, walletClient.account.address, bookManagerAddress),
49
51
  ]);
@@ -102,6 +104,34 @@ const approveAllForMarket = async ({ chainId, walletClient, token0, token1, opti
102
104
  await publicClient.waitForTransactionReceipt({ hash });
103
105
  await new Promise((resolve) => setTimeout(resolve, 1000));
104
106
  }
107
+ if (baseVaultToControllerAllowance < baseThreshold) {
108
+ const { request } = await publicClient.simulateContract({
109
+ account: walletClient.account,
110
+ chain: chain_1.CHAIN_MAP[chainId],
111
+ address: baseVault.address,
112
+ abi: approvalAbi,
113
+ functionName: 'approve',
114
+ args: [controllerAddress, maxValue],
115
+ });
116
+ const hash = await walletClient.writeContract(request);
117
+ transactionHashes.push(hash);
118
+ await publicClient.waitForTransactionReceipt({ hash });
119
+ await new Promise((resolve) => setTimeout(resolve, 1000));
120
+ }
121
+ if (quoteVaultToControllerAllowance < quoteThreshold) {
122
+ const { request } = await publicClient.simulateContract({
123
+ account: walletClient.account,
124
+ chain: chain_1.CHAIN_MAP[chainId],
125
+ address: quoteVault.address,
126
+ abi: approvalAbi,
127
+ functionName: 'approve',
128
+ args: [controllerAddress, maxValue],
129
+ });
130
+ const hash = await walletClient.writeContract(request);
131
+ transactionHashes.push(hash);
132
+ await publicClient.waitForTransactionReceipt({ hash });
133
+ await new Promise((resolve) => setTimeout(resolve, 1000));
134
+ }
105
135
  if (baseVaultToBookManagerAllowance < baseThreshold) {
106
136
  const { request } = await publicClient.simulateContract({
107
137
  account: walletClient.account,
@@ -1 +1 @@
1
- {"version":3,"file":"market.js","sourceRoot":"","sources":["../../../../src/calls/approval/market.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"market.js","sourceRoot":"","sources":["../../../../src/calls/approval/market.ts"],"names":[],"mappings":"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"}
@@ -5,9 +5,9 @@ const viem_1 = require("viem");
5
5
  const chain_1 = require("./chain");
6
6
  exports.CONTRACT_ADDRESSES = {
7
7
  [chain_1.CHAIN_IDS.BASE_SEPOLIA]: {
8
- Controller: (0, viem_1.getAddress)('0x318fb295c3617a5123826af0d3f4528decde57be'),
9
- BookManager: (0, viem_1.getAddress)('0x1b408015a7142ffe187b55870f00fd38556c4749'),
10
- BookViewer: (0, viem_1.getAddress)('0xadab496614ec3839a7fe1af622f6d70a5e442773'),
8
+ Controller: (0, viem_1.getAddress)('0x16718b37c7e62cfc43f5af40adf7f91bbdb5e31b'),
9
+ BookManager: (0, viem_1.getAddress)('0xf0fd18ded3878d61216c9d5a774cdd741e98234c'),
10
+ BookViewer: (0, viem_1.getAddress)('0x30657df9c499145fdb1af5f00a0700564116513a'),
11
11
  LayerZeroSponsor: (0, viem_1.getAddress)('0xbf7d9940df134182f3118adc49f3a64470a02997'),
12
12
  },
13
13
  [chain_1.CHAIN_IDS.BASE]: {
@@ -6,7 +6,7 @@ const chain_1 = require("./chain");
6
6
  exports.SUBGRAPH_URL = {
7
7
  [chain_1.CHAIN_IDS.BASE_SEPOLIA]: 'https://api.goldsky.com/api/public/project_cmgzlk7w5006f5np2680n2rhg/subgraphs/g1st-dex-base-sepolia/5e00da0/gn',
8
8
  [chain_1.CHAIN_IDS.BASE]: 'https://api.goldsky.com/api/public/project_cmgzlk7w5006f5np2680n2rhg/subgraphs/g1st-dex-base-mainnet/130a014/gn',
9
- [chain_1.CHAIN_IDS.ARBITRUM_SEPOLIA]: 'https://subgraph.satsuma-prod.com/f890d39dbfc0/spring--767127/1st-dex-arbitrum-sepolia/api',
9
+ [chain_1.CHAIN_IDS.ARBITRUM_SEPOLIA]: 'https://api.goldsky.com/api/public/project_cmgzlk7w5006f5np2680n2rhg/subgraphs/first-dex-base-sepolia/1.0.1/gn',
10
10
  [chain_1.CHAIN_IDS.ANVIL]: 'http://localhost:8000/subgraphs/name/first-dex-subgraph',
11
11
  };
12
12
  class Subgraph {
@@ -1 +1 @@
1
- {"version":3,"file":"subgraph.js","sourceRoot":"","sources":["../../../../src/constants/chain-configs/subgraph.ts"],"names":[],"mappings":";;;AAAA,iCAA0B;AAE1B,mCAAoC;AAEvB,QAAA,YAAY,GAAqC;IAC5D,CAAC,iBAAS,CAAC,YAAY,CAAC,EACtB,iHAAiH;IACnH,CAAC,iBAAS,CAAC,IAAI,CAAC,EACd,iHAAiH;IACnH,CAAC,iBAAS,CAAC,gBAAgB,CAAC,EAC1B,4FAA4F;IAC9F,CAAC,iBAAS,CAAC,KAAK,CAAC,EAAE,yDAAyD;CAC7E,CAAC;AAEF,MAAa,QAAQ;IACZ,MAAM,CAAC,KAAK,CAAC,GAAG,CACrB,OAAkB,EAClB,aAAqB,EACrB,KAAa,EACb,SAAa;QAEb,IAAI,CAAC,oBAAY,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACpD,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,IAAI,CAC/B,oBAAY,CAAC,OAAO,CAAC,EACrB,EAAE,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,EACnC;YACE,OAAO,EAAE,MAAM;SAChB,CACF,CAAC;QAEF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,OAAO,QAAQ,CAAC,IAAI,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAE,QAAQ,CAAC,IAAY,CAAC,MAAM,IAAI,sBAAsB,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;CACF;AAxBD,4BAwBC"}
1
+ {"version":3,"file":"subgraph.js","sourceRoot":"","sources":["../../../../src/constants/chain-configs/subgraph.ts"],"names":[],"mappings":";;;AAAA,iCAA0B;AAE1B,mCAAoC;AAEvB,QAAA,YAAY,GAAqC;IAC5D,CAAC,iBAAS,CAAC,YAAY,CAAC,EACtB,iHAAiH;IACnH,CAAC,iBAAS,CAAC,IAAI,CAAC,EACd,iHAAiH;IACnH,CAAC,iBAAS,CAAC,gBAAgB,CAAC,EAC1B,gHAAgH;IAClH,CAAC,iBAAS,CAAC,KAAK,CAAC,EAAE,yDAAyD;CAC7E,CAAC;AAEF,MAAa,QAAQ;IACZ,MAAM,CAAC,KAAK,CAAC,GAAG,CACrB,OAAkB,EAClB,aAAqB,EACrB,KAAa,EACb,SAAa;QAEb,IAAI,CAAC,oBAAY,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACpD,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,IAAI,CAC/B,oBAAY,CAAC,OAAO,CAAC,EACrB,EAAE,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,EACnC;YACE,OAAO,EAAE,MAAM;SAChB,CACF,CAAC;QAEF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,OAAO,QAAQ,CAAC,IAAI,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAE,QAAQ,CAAC,IAAY,CAAC,MAAM,IAAI,sBAAsB,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;CACF;AAxBD,4BAwBC"}
@@ -75,9 +75,11 @@ export const approveAllForMarket = async ({ chainId, walletClient, token0, token
75
75
  const baseThreshold = maxValue - oneMillionBase;
76
76
  const quoteThreshold = maxValue - oneMillionQuote;
77
77
  // Check current allowances
78
- const [baseToControllerAllowance, quoteToControllerAllowance, baseVaultToBookManagerAllowance, quoteVaultToBookManagerAllowance,] = await Promise.all([
78
+ const [baseToControllerAllowance, quoteToControllerAllowance, baseVaultToControllerAllowance, quoteVaultToControllerAllowance, baseVaultToBookManagerAllowance, quoteVaultToBookManagerAllowance,] = await Promise.all([
79
79
  fetchAllowance(publicClient, baseTokenAddress, walletClient.account.address, controllerAddress),
80
80
  fetchAllowance(publicClient, quoteTokenAddress, walletClient.account.address, controllerAddress),
81
+ fetchAllowance(publicClient, baseVault.address, walletClient.account.address, controllerAddress),
82
+ fetchAllowance(publicClient, quoteVault.address, walletClient.account.address, controllerAddress),
81
83
  fetchAllowance(publicClient, baseVault.address, walletClient.account.address, bookManagerAddress),
82
84
  fetchAllowance(publicClient, quoteVault.address, walletClient.account.address, bookManagerAddress),
83
85
  ]);
@@ -144,6 +146,42 @@ export const approveAllForMarket = async ({ chainId, walletClient, token0, token
144
146
  // Wait 1 second before proceeding (to avoid nonce issues)
145
147
  await new Promise((resolve) => setTimeout(resolve, 1000));
146
148
  }
149
+ // Approve base vault to controller if needed
150
+ if (baseVaultToControllerAllowance < baseThreshold) {
151
+ // Simulate the contract call first to validate it will succeed
152
+ const { request } = await publicClient.simulateContract({
153
+ account: walletClient.account,
154
+ chain: CHAIN_MAP[chainId],
155
+ address: baseVault.address,
156
+ abi: approvalAbi,
157
+ functionName: 'approve',
158
+ args: [controllerAddress, maxValue],
159
+ });
160
+ const hash = await walletClient.writeContract(request);
161
+ transactionHashes.push(hash);
162
+ // Wait for transaction confirmation to ensure nonce is updated
163
+ await publicClient.waitForTransactionReceipt({ hash });
164
+ // Wait 1 second before proceeding (to avoid nonce issues)
165
+ await new Promise((resolve) => setTimeout(resolve, 1000));
166
+ }
167
+ // Approve quote vault to controller if needed
168
+ if (quoteVaultToControllerAllowance < quoteThreshold) {
169
+ // Simulate the contract call first to validate it will succeed
170
+ const { request } = await publicClient.simulateContract({
171
+ account: walletClient.account,
172
+ chain: CHAIN_MAP[chainId],
173
+ address: quoteVault.address,
174
+ abi: approvalAbi,
175
+ functionName: 'approve',
176
+ args: [controllerAddress, maxValue],
177
+ });
178
+ const hash = await walletClient.writeContract(request);
179
+ transactionHashes.push(hash);
180
+ // Wait for transaction confirmation to ensure nonce is updated
181
+ await publicClient.waitForTransactionReceipt({ hash });
182
+ // Wait 1 second before proceeding (to avoid nonce issues)
183
+ await new Promise((resolve) => setTimeout(resolve, 1000));
184
+ }
147
185
  // Approve base vault to book manager if needed
148
186
  if (baseVaultToBookManagerAllowance < baseThreshold) {
149
187
  // Simulate the contract call first to validate it will succeed
@@ -1 +1 @@
1
- {"version":3,"file":"market.js","sourceRoot":"","sources":["../../../../src/calls/approval/market.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"market.js","sourceRoot":"","sources":["../../../../src/calls/approval/market.ts"],"names":[],"mappings":"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"}
@@ -2,9 +2,9 @@ import { getAddress } from 'viem';
2
2
  import { CHAIN_IDS } from './chain';
3
3
  export const CONTRACT_ADDRESSES = {
4
4
  [CHAIN_IDS.BASE_SEPOLIA]: {
5
- Controller: getAddress('0x318fb295c3617a5123826af0d3f4528decde57be'),
6
- BookManager: getAddress('0x1b408015a7142ffe187b55870f00fd38556c4749'),
7
- BookViewer: getAddress('0xadab496614ec3839a7fe1af622f6d70a5e442773'),
5
+ Controller: getAddress('0x16718b37c7e62cfc43f5af40adf7f91bbdb5e31b'),
6
+ BookManager: getAddress('0xf0fd18ded3878d61216c9d5a774cdd741e98234c'),
7
+ BookViewer: getAddress('0x30657df9c499145fdb1af5f00a0700564116513a'),
8
8
  LayerZeroSponsor: getAddress('0xbf7d9940df134182f3118adc49f3a64470a02997'),
9
9
  },
10
10
  [CHAIN_IDS.BASE]: {
@@ -3,7 +3,7 @@ import { CHAIN_IDS } from './chain';
3
3
  export const SUBGRAPH_URL = {
4
4
  [CHAIN_IDS.BASE_SEPOLIA]: 'https://api.goldsky.com/api/public/project_cmgzlk7w5006f5np2680n2rhg/subgraphs/g1st-dex-base-sepolia/5e00da0/gn',
5
5
  [CHAIN_IDS.BASE]: 'https://api.goldsky.com/api/public/project_cmgzlk7w5006f5np2680n2rhg/subgraphs/g1st-dex-base-mainnet/130a014/gn',
6
- [CHAIN_IDS.ARBITRUM_SEPOLIA]: 'https://subgraph.satsuma-prod.com/f890d39dbfc0/spring--767127/1st-dex-arbitrum-sepolia/api',
6
+ [CHAIN_IDS.ARBITRUM_SEPOLIA]: 'https://api.goldsky.com/api/public/project_cmgzlk7w5006f5np2680n2rhg/subgraphs/first-dex-base-sepolia/1.0.1/gn',
7
7
  [CHAIN_IDS.ANVIL]: 'http://localhost:8000/subgraphs/name/first-dex-subgraph',
8
8
  };
9
9
  export class Subgraph {
@@ -1 +1 @@
1
- {"version":3,"file":"subgraph.js","sourceRoot":"","sources":["../../../../src/constants/chain-configs/subgraph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,MAAM,CAAC,MAAM,YAAY,GAAqC;IAC5D,CAAC,SAAS,CAAC,YAAY,CAAC,EACtB,iHAAiH;IACnH,CAAC,SAAS,CAAC,IAAI,CAAC,EACd,iHAAiH;IACnH,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAC1B,4FAA4F;IAC9F,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,yDAAyD;CAC7E,CAAC;AAEF,MAAM,OAAO,QAAQ;IACZ,MAAM,CAAC,KAAK,CAAC,GAAG,CACrB,OAAkB,EAClB,aAAqB,EACrB,KAAa,EACb,SAAa;QAEb,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACpD,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAC/B,YAAY,CAAC,OAAO,CAAC,EACrB,EAAE,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,EACnC;YACE,OAAO,EAAE,MAAM,EAAE,yBAAyB;SAC3C,CACF,CAAC;QAEF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,OAAO,QAAQ,CAAC,IAAI,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAE,QAAQ,CAAC,IAAY,CAAC,MAAM,IAAI,sBAAsB,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;CACF"}
1
+ {"version":3,"file":"subgraph.js","sourceRoot":"","sources":["../../../../src/constants/chain-configs/subgraph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,MAAM,CAAC,MAAM,YAAY,GAAqC;IAC5D,CAAC,SAAS,CAAC,YAAY,CAAC,EACtB,iHAAiH;IACnH,CAAC,SAAS,CAAC,IAAI,CAAC,EACd,iHAAiH;IACnH,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAC1B,gHAAgH;IAClH,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,yDAAyD;CAC7E,CAAC;AAEF,MAAM,OAAO,QAAQ;IACZ,MAAM,CAAC,KAAK,CAAC,GAAG,CACrB,OAAkB,EAClB,aAAqB,EACrB,KAAa,EACb,SAAa;QAEb,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACpD,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAC/B,YAAY,CAAC,OAAO,CAAC,EACrB,EAAE,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,EACnC;YACE,OAAO,EAAE,MAAM,EAAE,yBAAyB;SAC3C,CACF,CAAC;QAEF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,OAAO,QAAQ,CAAC,IAAI,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAE,QAAQ,CAAC,IAAY,CAAC,MAAM,IAAI,sBAAsB,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;CACF"}