Skip to content

Commit

Permalink
Aug 23, 2024, 9:47 PM
Browse files Browse the repository at this point in the history
  • Loading branch information
@actions-user
actions-user committed Aug 24, 2024
1 parent aae0e44 commit 0da8271
Show file tree
Hide file tree
Showing 19 changed files with 94 additions and 62 deletions.
4 changes: 3 additions & 1 deletion src/adapters/acala/acala.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class BaseAcalaAdapter extends BaseCrossChainAdapter {
public subscribeTokenBalance(
token: string,
address: string,
tokenId?: string
tokenId: string
): Observable<BalanceData> {
if (!this.wallet) {
throw new ApiNotFound(this.chain.id);
Expand All @@ -91,6 +91,7 @@ class BaseAcalaAdapter extends BaseCrossChainAdapter {

public subscribeMaxInput(
token: string,
tokenId: string,
address: string,
to: ChainId
): Observable<FixedPointNumber> {
Expand All @@ -108,6 +109,7 @@ class BaseAcalaAdapter extends BaseCrossChainAdapter {
amount: FixedPointNumber.ZERO,
to,
token,
tokenId,
address:
to === "moonriver" || to === "moonbeam"
? "0x0000000000000000000000000000000000000000"
Expand Down
12 changes: 7 additions & 5 deletions src/adapters/astar.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ class AstarBalanceAdapter extends BalanceAdapter {
public subscribeBalance(
token: string,
address: string,
tokenId?: string
tokenId: string
): Observable<BalanceData> {
const storage = this.storages.balances(address);

Expand Down Expand Up @@ -190,7 +190,7 @@ class AstarBalanceAdapter extends BalanceAdapter {
map((balance) => {
const amount = FN.fromInner(
balance.unwrapOrDefault()?.balance?.toString() || "0",
this.getToken(token).decimals
this.getToken(token, tokenId).decimals
);

return {
Expand Down Expand Up @@ -224,7 +224,7 @@ class BaseAstarAdapter extends BaseCrossChainAdapter {
public subscribeTokenBalance(
token: string,
address: string,
tokenId?: string
tokenId: string
): Observable<BalanceData> {
if (!this.balanceAdapter) {
throw new ApiNotFound(this.chain.id);
Expand All @@ -235,6 +235,7 @@ class BaseAstarAdapter extends BaseCrossChainAdapter {

public subscribeMaxInput(
token: string,
tokenId: string,
address: string,
to: ChainId
): Observable<FN> {
Expand All @@ -249,16 +250,17 @@ class BaseAstarAdapter extends BaseCrossChainAdapter {
amount: FN.ZERO,
to,
token,
tokenId,
address,
signer: address,
})
: "0",
balance: this.balanceAdapter
.subscribeBalance(token, address)
.subscribeBalance(token, address, tokenId)
.pipe(map((i) => i.available)),
}).pipe(
map(({ balance, txFee }) => {
const tokenMeta = this.balanceAdapter?.getToken(token);
const tokenMeta = this.balanceAdapter?.getToken(token, tokenId);
const feeFactor = 1.2;
const fee = FN.fromInner(txFee, tokenMeta?.decimals).mul(
new FN(feeFactor)
Expand Down
12 changes: 7 additions & 5 deletions src/adapters/bifrost.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ class BifrostBalanceAdapter extends BalanceAdapter {
public subscribeBalance(
token: string,
address: string,
tokenId?: string
tokenId: string
): Observable<BalanceData> {
if (!validateAddress(address)) throw new InvalidAddress(address);

Expand All @@ -309,7 +309,7 @@ class BifrostBalanceAdapter extends BalanceAdapter {
map((balance) => {
const amount = FN.fromInner(
balance.free?.toString() || "0",
this.getToken(token).decimals
this.getToken(token, tokenId).decimals
);

return {
Expand Down Expand Up @@ -341,7 +341,7 @@ class BaseBifrostAdapter extends BaseCrossChainAdapter {
public subscribeTokenBalance(
token: string,
address: string,
tokenId?: string
tokenId: string
): Observable<BalanceData> {
if (!this.balanceAdapter) {
throw new ApiNotFound(this.chain.id);
Expand All @@ -352,6 +352,7 @@ class BaseBifrostAdapter extends BaseCrossChainAdapter {

public subscribeMaxInput(
token: string,
tokenId: string,
address: string,
to: ChainId
): Observable<FN> {
Expand All @@ -366,16 +367,17 @@ class BaseBifrostAdapter extends BaseCrossChainAdapter {
amount: FN.ZERO,
to,
token,
tokenId,
address,
signer: address,
})
: "0",
balance: this.balanceAdapter
.subscribeBalance(token, address)
.subscribeBalance(token, address,tokenId)
.pipe(map((i) => i.available)),
}).pipe(
map(({ balance, txFee }) => {
const tokenMeta = this.balanceAdapter?.getToken(token);
const tokenMeta = this.balanceAdapter?.getToken(token, tokenId);
const feeFactor = 1.2;
const fee = FN.fromInner(txFee, tokenMeta?.decimals).mul(
new FN(feeFactor)
Expand Down
10 changes: 6 additions & 4 deletions src/adapters/centrifuge.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class CentrifugeBalanceAdapter extends BalanceAdapter {
public subscribeBalance(
name: string,
address: string,
tokenId?: string
tokenId: string
): Observable<BalanceData> {
if (!validateAddress(address)) throw new InvalidAddress(address);

Expand Down Expand Up @@ -162,7 +162,7 @@ class BaseCentrifugeAdapter extends BaseCrossChainAdapter {
public subscribeTokenBalance(
token: string,
address: string,
tokenId?: string
tokenId: string
): Observable<BalanceData> {
if (!this.balanceAdapter) {
throw new ApiNotFound(this.chain.id);
Expand All @@ -173,6 +173,7 @@ class BaseCentrifugeAdapter extends BaseCrossChainAdapter {

public subscribeMaxInput(
token: string,
tokenId: string,
address: string,
to: ChainId
): Observable<FN> {
Expand All @@ -187,16 +188,17 @@ class BaseCentrifugeAdapter extends BaseCrossChainAdapter {
amount: FN.ZERO,
to,
token,
tokenId,
address,
signer: address,
})
: "0",
balance: this.balanceAdapter
.subscribeBalance(token, address)
.subscribeBalance(token, address, tokenId)
.pipe(map((i) => i.available)),
}).pipe(
map(({ balance, txFee }) => {
const tokenMeta = this.balanceAdapter?.getToken(token);
const tokenMeta = this.balanceAdapter?.getToken(token, tokenId);
const feeFactor = 1.2;
const fee = FN.fromInner(txFee, tokenMeta?.decimals).mul(
new FN(feeFactor)
Expand Down
12 changes: 7 additions & 5 deletions src/adapters/crust.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class CrustBalanceAdapter extends BalanceAdapter {
public subscribeBalance(
token: string,
address: string,
tokenId?: string
tokenId: string
): Observable<BalanceData> {
const storage = this.storages.balances(address);

Expand Down Expand Up @@ -134,7 +134,7 @@ class CrustBalanceAdapter extends BalanceAdapter {
map((balance) => {
const amount = FN.fromInner(
balance.unwrapOrDefault()?.balance?.toString() || "0",
this.getToken(token).decimals
this.getToken(token, tokenId).decimals
);

return {
Expand Down Expand Up @@ -166,7 +166,7 @@ class BaseCrustAdapter extends BaseCrossChainAdapter {
public subscribeTokenBalance(
token: string,
address: string,
tokenId?: string
tokenId: string
): Observable<BalanceData> {
if (!this.balanceAdapter) {
throw new ApiNotFound(this.chain.id);
Expand All @@ -177,6 +177,7 @@ class BaseCrustAdapter extends BaseCrossChainAdapter {

public subscribeMaxInput(
token: string,
tokenId: string,
address: string,
to: ChainId
): Observable<FN> {
Expand All @@ -191,16 +192,17 @@ class BaseCrustAdapter extends BaseCrossChainAdapter {
amount: FN.ZERO,
to,
token,
tokenId,
address,
signer: address,
})
: "0",
balance: this.balanceAdapter
.subscribeBalance(token, address)
.subscribeBalance(token, address, tokenId)
.pipe(map((i) => i.available)),
}).pipe(
map(({ balance, txFee }) => {
const tokenMeta = this.balanceAdapter?.getToken(token);
const tokenMeta = this.balanceAdapter?.getToken(token, tokenId);
const feeFactor = 1.2;
const fee = FN.fromInner(txFee, tokenMeta?.decimals).mul(
new FN(feeFactor)
Expand Down
4 changes: 3 additions & 1 deletion src/adapters/darwinia.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ class BaseDarwiniaAdapter extends BaseCrossChainAdapter {

public subscribeMaxInput(
token: string,
tokenId: string,
address: string,
to: ChainId
): Observable<FN> {
Expand All @@ -128,6 +129,7 @@ class BaseDarwiniaAdapter extends BaseCrossChainAdapter {
amount: FN.ONE,
to,
token,
tokenId,
address,
signer: address,
})
Expand All @@ -137,7 +139,7 @@ class BaseDarwiniaAdapter extends BaseCrossChainAdapter {
.pipe(map((i) => i.available)),
}).pipe(
map(({ balance, txFee }) => {
const tokenMeta = this.balanceAdapter?.getToken(token);
const tokenMeta = this.balanceAdapter?.getToken(token, tokenId);
const feeFactor = 1.2;
const fee = FN.fromInner(txFee, tokenMeta?.decimals).mul(
new FN(feeFactor)
Expand Down
10 changes: 6 additions & 4 deletions src/adapters/hydradx.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ class HydradxBalanceAdapter extends BalanceAdapter {
public subscribeBalance(
tokenName: string,
address: string,
tokenId?: string
tokenId: string
): Observable<BalanceData> {
const storage = this.storages.balances(address);

Expand Down Expand Up @@ -568,7 +568,7 @@ class BaseHydradxAdapter extends BaseCrossChainAdapter {
public subscribeTokenBalance(
token: string,
address: string,
tokenId?: string
tokenId: string
): Observable<BalanceData> {
if (!this.balanceAdapter) {
throw new ApiNotFound(this.chain.id);
Expand All @@ -579,6 +579,7 @@ class BaseHydradxAdapter extends BaseCrossChainAdapter {

public subscribeMaxInput(
token: string,
tokenId: string,
address: string,
to: ChainId
): Observable<FN> {
Expand All @@ -593,16 +594,17 @@ class BaseHydradxAdapter extends BaseCrossChainAdapter {
amount: FN.ZERO,
to,
token,
tokenId,
address,
signer: address,
})
: "0",
balance: this.balanceAdapter
.subscribeBalance(token, address)
.subscribeBalance(token, address, tokenId)
.pipe(map((i) => i.available)),
}).pipe(
map(({ balance, txFee }) => {
const tokenMeta = this.balanceAdapter?.getToken(token);
const tokenMeta = this.balanceAdapter?.getToken(token, tokenId);
const feeFactor = 1.2;
const fee = FN.fromInner(txFee, tokenMeta?.decimals).mul(
new FN(feeFactor)
Expand Down
4 changes: 3 additions & 1 deletion src/adapters/integritee.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ class BaseIntegriteeAdapter extends BaseCrossChainAdapter {

public subscribeMaxInput(
token: string,
tokenId: string,
address: string,
to: ChainId
): Observable<FN> {
Expand All @@ -122,6 +123,7 @@ class BaseIntegriteeAdapter extends BaseCrossChainAdapter {
amount: FN.ZERO,
to,
token,
tokenId,
address,
signer: address,
})
Expand All @@ -131,7 +133,7 @@ class BaseIntegriteeAdapter extends BaseCrossChainAdapter {
.pipe(map((i) => i.available)),
}).pipe(
map(({ balance, txFee }) => {
const tokenMeta = this.balanceAdapter?.getToken(token);
const tokenMeta = this.balanceAdapter?.getToken(token, tokenId);
const feeFactor = 1.2;
const fee = FN.fromInner(txFee, tokenMeta?.decimals).mul(
new FN(feeFactor)
Expand Down
12 changes: 7 additions & 5 deletions src/adapters/interlay.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class InterlayBalanceAdapter extends BalanceAdapter {
public subscribeBalance(
token: string,
address: string,
tokenId?: string
tokenId: string
): Observable<BalanceData> {
if (!validateAddress(address)) throw new InvalidAddress(address);

Expand All @@ -145,7 +145,7 @@ class InterlayBalanceAdapter extends BalanceAdapter {
map((balance) => {
const amount = FN.fromInner(
balance.free?.toString() || "0",
this.getToken(token).decimals
this.getToken(token, tokenId).decimals
);

return {
Expand Down Expand Up @@ -179,7 +179,7 @@ class BaseInterlayAdapter extends BaseCrossChainAdapter {
public subscribeTokenBalance(
token: string,
address: string,
tokenId?: string
tokenId: string
): Observable<BalanceData> {
if (!this.balanceAdapter) {
throw new ApiNotFound(this.chain.id);
Expand All @@ -190,6 +190,7 @@ class BaseInterlayAdapter extends BaseCrossChainAdapter {

public subscribeMaxInput(
token: string,
tokenId: string,
address: string,
to: ChainId
): Observable<FN> {
Expand All @@ -204,16 +205,17 @@ class BaseInterlayAdapter extends BaseCrossChainAdapter {
amount: FN.ZERO,
to,
token,
tokenId,
address,
signer: address,
})
: "0",
balance: this.balanceAdapter
.subscribeBalance(token, address)
.subscribeBalance(token, address, tokenId)
.pipe(map((i) => i.available)),
}).pipe(
map(({ balance, txFee }) => {
const tokenMeta = this.balanceAdapter?.getToken(token);
const tokenMeta = this.balanceAdapter?.getToken(token, tokenId);
const feeFactor = 1.2;
const fee = FN.fromInner(txFee, tokenMeta?.decimals).mul(
new FN(feeFactor)
Expand Down
Loading

0 comments on commit 0da8271

Please sign in to comment.