@rabby-wallet/rabby-swap 0.0.2 → 0.0.3

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.
Files changed (5) hide show
  1. package/dist/dexs/0xapi.js +2 -2
  2. package/dist/dexs/paraswap.js +20 -9
  3. package/package.json +1 -1
  4. package/src/dexs/0xapi.ts +2 -2
  5. package/src/dexs/paraswap.ts +27 -10
package/dist/dexs/0xapi.js CHANGED
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  };
10
10
  import axios from "axios";
11
11
  import { CHAINS_ENUM, CHAINS } from "@debank/common";
12
- const NATIVE_TOKEN = 'ETH';
12
+ const NATIVE_TOKEN = '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee';
13
13
  const API_DOMAINS = {
14
14
  [CHAINS_ENUM.ETH]: "https://api.0x.org",
15
15
  [CHAINS_ENUM.POLYGON]: "https://polygon.api.0x.org",
@@ -66,7 +66,7 @@ export const getQuote = (options) => __awaiter(void 0, void 0, void 0, function*
66
66
  skipValidation: true,
67
67
  };
68
68
  if (options.feeRate) {
69
- params.buyTokenPercentageFee = options.feeRate;
69
+ params.buyTokenPercentageFee = options.feeRate / 100;
70
70
  params.feeRecipient = options.feeAddress;
71
71
  }
72
72
  const { data } = yield request.get('/swap/v1/quote', {
package/dist/dexs/paraswap.js CHANGED
@@ -51,17 +51,25 @@ export const getQuote = (options) => __awaiter(void 0, void 0, void 0, function*
51
51
  }
52
52
  const { priceRoute } = yield getPriceRoute({
53
53
  srcDecimals: options.fromTokenDecimals,
54
- srcToken: options.fromToken === CHAINS[options.chain].nativeTokenAddress ? NATIVE_TOKEN : options.fromToken,
55
- destToken: options.toToken === CHAINS[options.chain].nativeTokenAddress ? NATIVE_TOKEN : options.toToken,
54
+ srcToken: options.fromToken === CHAINS[options.chain].nativeTokenAddress
55
+ ? NATIVE_TOKEN
56
+ : options.fromToken,
57
+ destToken: options.toToken === CHAINS[options.chain].nativeTokenAddress
58
+ ? NATIVE_TOKEN
59
+ : options.toToken,
56
60
  amount: options.amount,
57
61
  userAddress: options.userAddress,
58
62
  network: chainId,
59
- includeContractMethods: 'simpleSwap,multiSwap,megaSwap',
63
+ includeContractMethods: "simpleSwap,multiSwap,megaSwap",
60
64
  });
61
65
  const params = {
62
- srcToken: options.fromToken === CHAINS[options.chain].nativeTokenAddress ? NATIVE_TOKEN : options.fromToken,
66
+ srcToken: options.fromToken === CHAINS[options.chain].nativeTokenAddress
67
+ ? NATIVE_TOKEN
68
+ : options.fromToken,
63
69
  srcDecimals: options.fromTokenDecimals,
64
- destToken: options.toToken === CHAINS[options.chain].nativeTokenAddress ? NATIVE_TOKEN : options.toToken,
70
+ destToken: options.toToken === CHAINS[options.chain].nativeTokenAddress
71
+ ? NATIVE_TOKEN
72
+ : options.toToken,
65
73
  srcAmount: options.amount,
66
74
  userAddress: options.userAddress,
67
75
  slippage: Math.floor(options.slippage * 100),
@@ -71,19 +79,22 @@ export const getQuote = (options) => __awaiter(void 0, void 0, void 0, function*
71
79
  params.partnerFeeBps = (options.feeRate * 100).toString();
72
80
  params.partnerAddress = options.feeAddress;
73
81
  }
74
- const { data } = yield request.get(`/transactions/${chainId}`, {
82
+ const { data } = yield request.post(`/transactions/${chainId}`, params, {
75
83
  params: {
76
84
  ignoreChecks: true,
77
85
  ignoreGasEstimate: true,
78
86
  },
79
- data: params,
80
87
  });
81
88
  return {
82
89
  tx: data,
83
- fromToken: priceRoute.srcToken === NATIVE_TOKEN ? CHAINS[options.chain].nativeTokenAddress : priceRoute.srcToken,
90
+ fromToken: priceRoute.srcToken === NATIVE_TOKEN
91
+ ? CHAINS[options.chain].nativeTokenAddress
92
+ : priceRoute.srcToken,
84
93
  fromTokenAmount: priceRoute.srcAmount,
85
94
  fromTokenDecimals: priceRoute.srcDecimals,
86
- toToken: priceRoute.destToken === NATIVE_TOKEN ? CHAINS[options.chain].nativeTokenAddress : priceRoute.destToken,
95
+ toToken: priceRoute.destToken === NATIVE_TOKEN
96
+ ? CHAINS[options.chain].nativeTokenAddress
97
+ : priceRoute.destToken,
87
98
  toTokenAmount: priceRoute.destAmount,
88
99
  toTokenDecimals: priceRoute.destDecimals,
89
100
  spender: data.to,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rabby-wallet/rabby-swap",
3
- "version": "0.0.2",
3
+ "version": "0.0.3",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
package/src/dexs/0xapi.ts CHANGED
@@ -2,7 +2,7 @@ import axios from "axios";
2
2
  import { CHAINS_ENUM, CHAINS } from "@debank/common";
3
3
  import { QuoteParams, Tx, QuoteResult } from "../quote";
4
4
 
5
- const NATIVE_TOKEN = 'ETH';
5
+ const NATIVE_TOKEN = '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee';
6
6
 
7
7
  const API_DOMAINS = {
8
8
  [CHAINS_ENUM.ETH]: "https://api.0x.org",
@@ -83,7 +83,7 @@ export const getQuote = async (options: QuoteParams): Promise<QuoteResult> => {
83
83
  };
84
84
 
85
85
  if (options.feeRate) {
86
- params.buyTokenPercentageFee = options.feeRate;
86
+ params.buyTokenPercentageFee = options.feeRate / 100;
87
87
  params.feeRecipient = options.feeAddress;
88
88
  }
89
89
 
package/src/dexs/paraswap.ts CHANGED
@@ -100,18 +100,30 @@ export const getQuote = async (options: QuoteParams): Promise<QuoteResult> => {
100
100
 
101
101
  const { priceRoute } = await getPriceRoute({
102
102
  srcDecimals: options.fromTokenDecimals,
103
- srcToken: options.fromToken === CHAINS[options.chain].nativeTokenAddress ? NATIVE_TOKEN : options.fromToken,
104
- destToken: options.toToken === CHAINS[options.chain].nativeTokenAddress ? NATIVE_TOKEN : options.toToken,
103
+ srcToken:
104
+ options.fromToken === CHAINS[options.chain].nativeTokenAddress
105
+ ? NATIVE_TOKEN
106
+ : options.fromToken,
107
+ destToken:
108
+ options.toToken === CHAINS[options.chain].nativeTokenAddress
109
+ ? NATIVE_TOKEN
110
+ : options.toToken,
105
111
  amount: options.amount,
106
112
  userAddress: options.userAddress,
107
113
  network: chainId,
108
- includeContractMethods: 'simpleSwap,multiSwap,megaSwap',
114
+ includeContractMethods: "simpleSwap,multiSwap,megaSwap",
109
115
  });
110
116
 
111
117
  const params: SwapParams = {
112
- srcToken: options.fromToken === CHAINS[options.chain].nativeTokenAddress ? NATIVE_TOKEN : options.fromToken,
118
+ srcToken:
119
+ options.fromToken === CHAINS[options.chain].nativeTokenAddress
120
+ ? NATIVE_TOKEN
121
+ : options.fromToken,
113
122
  srcDecimals: options.fromTokenDecimals,
114
- destToken: options.toToken === CHAINS[options.chain].nativeTokenAddress ? NATIVE_TOKEN : options.toToken,
123
+ destToken:
124
+ options.toToken === CHAINS[options.chain].nativeTokenAddress
125
+ ? NATIVE_TOKEN
126
+ : options.toToken,
115
127
  srcAmount: options.amount,
116
128
  userAddress: options.userAddress,
117
129
  slippage: Math.floor(options.slippage * 100),
@@ -123,20 +135,25 @@ export const getQuote = async (options: QuoteParams): Promise<QuoteResult> => {
123
135
  params.partnerAddress = options.feeAddress;
124
136
  }
125
137
 
126
- const { data } = await request.get<Tx>(`/transactions/${chainId}`, {
138
+ const { data } = await request.post<Tx>(`/transactions/${chainId}`, params, {
127
139
  params: {
128
140
  ignoreChecks: true,
129
141
  ignoreGasEstimate: true,
130
142
  },
131
- data: params,
132
143
  });
133
-
144
+
134
145
  return {
135
146
  tx: data,
136
- fromToken: priceRoute.srcToken === NATIVE_TOKEN ? CHAINS[options.chain].nativeTokenAddress : priceRoute.srcToken,
147
+ fromToken:
148
+ priceRoute.srcToken === NATIVE_TOKEN
149
+ ? CHAINS[options.chain].nativeTokenAddress
150
+ : priceRoute.srcToken,
137
151
  fromTokenAmount: priceRoute.srcAmount,
138
152
  fromTokenDecimals: priceRoute.srcDecimals,
139
- toToken: priceRoute.destToken === NATIVE_TOKEN ? CHAINS[options.chain].nativeTokenAddress : priceRoute.destToken,
153
+ toToken:
154
+ priceRoute.destToken === NATIVE_TOKEN
155
+ ? CHAINS[options.chain].nativeTokenAddress
156
+ : priceRoute.destToken,
140
157
  toTokenAmount: priceRoute.destAmount,
141
158
  toTokenDecimals: priceRoute.destDecimals,
142
159
  spender: data.to,