Skip to content

Commit eff7e69

Browse files
authored
Merge branch 'main' into btc
2 parents 8a8756f + 756c393 commit eff7e69

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

src/basic/request/restful.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { Buffer } from 'buffer';
2+
13
import fetch, { Response } from 'cross-fetch';
24
import timeoutSignal from 'timeout-signal';
35
import { URL, URLSearchParams } from 'whatwg-url';
@@ -66,7 +68,9 @@ class RestfulRequest {
6668

6769
const url = this.buildUrl(path);
6870
const body =
69-
typeof data === 'object'
71+
headers['Content-Type'] === 'application/x-binary'
72+
? Buffer.from(data as string, 'hex')
73+
: typeof data === 'object'
7074
? json
7175
? JSON.stringify(data)
7276
: new URLSearchParams(data).toString()

src/provider/chains/algo/provider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class Provider extends BaseProvider {
8383
check(
8484
suggestedParams &&
8585
suggestedParamsExpiredAt &&
86-
suggestedParamsExpiredAt < Date.now(),
86+
suggestedParamsExpiredAt > Date.now(),
8787
'Please refresh suggestedParams',
8888
);
8989

src/provider/chains/sol/provider.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,10 @@ class Provider extends BaseProvider {
209209
isValid,
210210
};
211211
}
212-
/***
213-
* Note: this method is used to verify associatedTokenAddress instead of mintAddress(if mintAddress use verifyAddress or getTokenInfos instead)
214-
*
215-
*/
216-
async verifyTokenAddress(address: string): Promise<AddressValidation> {
212+
213+
async verifyAssociatedTokenAddress(
214+
address: string,
215+
): Promise<AddressValidation> {
217216
const result = await this.verifyAddress(address);
218217
if (result.isValid) {
219218
const isOnCurve = PublicKey.isOnCurve(bs58.decode(address));

tests/provider/chains/algo/provider.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ test('signTransaction for payment', async () => {
217217
},
218218
],
219219
payload: {
220-
suggestedParamsExpiredAt: 1600000000000 - 1,
220+
suggestedParamsExpiredAt: 1600000000000 + 1,
221221
suggestedParams: {
222222
flatFee: false,
223223
fee: 0,
@@ -309,7 +309,7 @@ test('signTransaction for token transfer', async () => {
309309
},
310310
],
311311
payload: {
312-
suggestedParamsExpiredAt: 1600000000000 - 1,
312+
suggestedParamsExpiredAt: 1600000000000 + 1,
313313
suggestedParams: {
314314
flatFee: false,
315315
fee: 0,

0 commit comments

Comments
 (0)