rubic-sdk 6.0.0-alpha.ton.67 → 6.0.0-alpha.ton.68
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/lib/features/on-chain/calculation-manager/providers/aggregators/dedust/services/dedust-swap-service.d.ts +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/dedust/services/dedust-swap-service.js +11 -4
- package/lib/features/on-chain/calculation-manager/providers/aggregators/dedust/services/dedust-swap-service.js.map +1 -1
- package/package.json +1 -1
|
@@ -76,11 +76,10 @@ class DedustSwapService {
|
|
|
76
76
|
await this.swapJettonToTon(from, sender, minAmountOut);
|
|
77
77
|
}
|
|
78
78
|
else {
|
|
79
|
-
await this.
|
|
79
|
+
await this.swapJettonToJetton(from, sender);
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
82
|
catch (err) {
|
|
83
|
-
console.trace('ERR_TRACE ==> ', err.stack);
|
|
84
83
|
throw err;
|
|
85
84
|
}
|
|
86
85
|
}
|
|
@@ -159,8 +158,16 @@ class DedustSwapService {
|
|
|
159
158
|
const pool = this.pools[0];
|
|
160
159
|
const jettonVault = await this.getVault(from);
|
|
161
160
|
const parsedAddress = core_1.Address.parse(from.address);
|
|
161
|
+
console.log('START ==> ', {
|
|
162
|
+
root: parsedAddress.toString(),
|
|
163
|
+
owner: sender.address.toString()
|
|
164
|
+
});
|
|
162
165
|
const jettonRoot = this.tonClient.open(sdk_1.JettonRoot.createFromAddress(parsedAddress));
|
|
163
|
-
const
|
|
166
|
+
const jettonWalletAddress = await jettonRoot.getWalletAddress(sender.address);
|
|
167
|
+
console.log('END ==> ', {
|
|
168
|
+
wallet: jettonWalletAddress.toString()
|
|
169
|
+
});
|
|
170
|
+
const jettonWallet = this.tonClient.open(sdk_1.JettonWallet.createFromAddress(jettonWalletAddress));
|
|
164
171
|
await jettonWallet.sendTransfer(sender, (0, core_1.toNano)(dedust_gas_1.DEDUST_GAS), {
|
|
165
172
|
amount: (0, core_1.toNano)(from.tokenAmount.toFixed()),
|
|
166
173
|
destination: jettonVault.address,
|
|
@@ -172,7 +179,7 @@ class DedustSwapService {
|
|
|
172
179
|
})
|
|
173
180
|
});
|
|
174
181
|
}
|
|
175
|
-
async
|
|
182
|
+
async swapJettonToJetton(from, sender) {
|
|
176
183
|
const jettonVault = await this.getVault(from);
|
|
177
184
|
const parsedAddress = core_1.Address.parse(from.address);
|
|
178
185
|
const jettonRoot = this.tonClient.open(sdk_1.JettonRoot.createFromAddress(parsedAddress));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dedust-swap-service.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/dedust/services/dedust-swap-service.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"dedust-swap-service.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/aggregators/dedust/services/dedust-swap-service.ts"],"names":[],"mappings":"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"}
|