Skip to content

Commit

Permalink
Aug 23, 2024, 9:55 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 0da8271 commit 98fa2ed
Show file tree
Hide file tree
Showing 11 changed files with 55 additions and 33 deletions.
4 changes: 3 additions & 1 deletion src/adapters/nodle.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ class BaseNodleAdapter extends BaseCrossChainAdapter {

public subscribeMaxInput(
token: string,
tokenId: string,
address: string,
to: ChainId
): Observable<FN> {
Expand All @@ -125,6 +126,7 @@ class BaseNodleAdapter extends BaseCrossChainAdapter {
amount: FN.ZERO,
to,
token,
tokenId,
address,
signer: address,
})
Expand All @@ -134,7 +136,7 @@ class BaseNodleAdapter 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/oak.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class OakBalanceAdapter extends BalanceAdapter {
public subscribeBalance(
token: string,
address: string,
tokenId?: string
tokenId: string
): Observable<BalanceData> {
if (!validateAddress(address)) throw new InvalidAddress(address);

Expand Down Expand Up @@ -181,7 +181,7 @@ class BaseOakAdapter 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 @@ -192,6 +192,7 @@ class BaseOakAdapter extends BaseCrossChainAdapter {

public subscribeMaxInput(
token: string,
tokenId: string,
address: string,
to: ChainId
): Observable<FN> {
Expand All @@ -206,16 +207,17 @@ class BaseOakAdapter 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/parallel.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ class ParallelBalanceAdapter extends BalanceAdapter {
public subscribeBalance(
token: string,
address: string,
tokenId?: string
tokenId: string
): Observable<BalanceData> {
if (!validateAddress(address)) throw new InvalidAddress(address);

Expand Down Expand Up @@ -328,7 +328,7 @@ class BaseParallelAdapter 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 @@ -339,6 +339,7 @@ class BaseParallelAdapter extends BaseCrossChainAdapter {

public subscribeMaxInput(
token: string,
tokenId: string,
address: string,
to: ChainId
): Observable<FN> {
Expand All @@ -353,16 +354,17 @@ class BaseParallelAdapter 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/pendulum.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ class BasePendulumAdapter extends BaseCrossChainAdapter {

public subscribeMaxInput(
token: string,
tokenId: string,
address: string,
to: ChainId
): Observable<FN> {
Expand All @@ -125,6 +126,7 @@ class BasePendulumAdapter extends BaseCrossChainAdapter {
amount: FN.ZERO,
to,
token,
tokenId,
address,
signer: address,
})
Expand All @@ -134,7 +136,7 @@ class BasePendulumAdapter 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/phala.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class PhalaBalanceAdapter extends BalanceAdapter {
public subscribeBalance(
token: string,
address: string,
tokenId?: string
tokenId: string
): Observable<BalanceData> {
const storage = this.storages.balances(address);

Expand Down Expand Up @@ -135,7 +135,7 @@ class PhalaBalanceAdapter 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 @@ -167,7 +167,7 @@ class BasePhalaAdapter 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 @@ -178,6 +178,7 @@ class BasePhalaAdapter extends BaseCrossChainAdapter {

public subscribeMaxInput(
token: string,
tokenId: string,
address: string,
to: ChainId
): Observable<FN> {
Expand All @@ -192,16 +193,17 @@ class BasePhalaAdapter 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/robonomics.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class RobonomicsBalanceAdapter extends BalanceAdapter {
public subscribeBalance(
token: string,
address: string,
tokenId?: string
tokenId: string
): Observable<BalanceData> {
const storage = this.storages.balances(address);

Expand Down Expand Up @@ -95,7 +95,7 @@ class RobonomicsBaseAdapter 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 @@ -106,6 +106,7 @@ class RobonomicsBaseAdapter extends BaseCrossChainAdapter {

public subscribeMaxInput(
token: string,
tokenId: string,
address: string,
to: ChainId
): Observable<FN> {
Expand All @@ -118,15 +119,16 @@ class RobonomicsBaseAdapter extends BaseCrossChainAdapter {
amount: FN.ZERO,
to,
token,
tokenId,
address,
signer: address,
}),
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/statemint.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ class StatemintBalanceAdapter extends BalanceAdapter {
public subscribeBalance(
tokenName: string,
address: string,
tokenId?: string
tokenId: string
): Observable<BalanceData> {
if (!validateAddress(address)) throw new InvalidAddress(address);

Expand Down Expand Up @@ -237,7 +237,7 @@ class BaseStatemintAdapter 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 @@ -248,6 +248,7 @@ class BaseStatemintAdapter extends BaseCrossChainAdapter {

public subscribeMaxInput(
token: string,
tokenId: string,
address: string,
to: ChainId
): Observable<FN> {
Expand All @@ -262,16 +263,17 @@ class BaseStatemintAdapter extends BaseCrossChainAdapter {
amount: FN.ONE,
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/subsocial.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ class BaseSubsocialAdapter extends BaseCrossChainAdapter {

public subscribeMaxInput(
token: string,
tokenId: string,
address: string,
to: ChainId
): Observable<FN> {
Expand All @@ -125,6 +126,7 @@ class BaseSubsocialAdapter extends BaseCrossChainAdapter {
amount: FN.ZERO,
to,
token,
tokenId,
address,
signer: address,
})
Expand All @@ -134,7 +136,7 @@ class BaseSubsocialAdapter 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/tinkernet.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class TinkernetBalanceAdapter extends BalanceAdapter {
public subscribeBalance(
token: string,
address: string,
tokenId?: string
tokenId: string
): Observable<BalanceData> {
const storage = this.storages.balances(address);

Expand Down Expand Up @@ -99,7 +99,7 @@ class TinkernetBaseAdapter 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 @@ -110,6 +110,7 @@ class TinkernetBaseAdapter extends BaseCrossChainAdapter {

public subscribeMaxInput(
token: string,
tokenId: string,
address: string,
to: ChainId
): Observable<FN> {
Expand All @@ -122,15 +123,16 @@ class TinkernetBaseAdapter extends BaseCrossChainAdapter {
amount: FN.ZERO,
to,
token,
tokenId,
address,
signer: address,
}),
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 98fa2ed

Please sign in to comment.