Skip to content

Commit 6534d70

Browse files
committed
fix ibc channels error
1 parent 3369fd2 commit 6534d70

6 files changed

Lines changed: 19 additions & 14 deletions

File tree

package/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@terra-money/bridge-sdk",
3-
"version": "1.0.0-beta.2",
3+
"version": "1.0.0-beta.3",
44
"description": "",
55
"main": "dist/index.js",
66
"typings": "dist/index.d.ts",

package/src/const/chains.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ export const chainIDs: Record<ChainType, string> = {
1414
[ChainType.ethereum]: '0x1',
1515
}
1616

17-
export const ibcChannels = {
17+
export const ibcChannels: Record<
18+
string,
19+
Record<string | BridgeType.axelar, string>
20+
> = {
1821
[ChainType.terra]: {
1922
[ChainType.cosmos]: 'channel-0',
2023
[ChainType.osmosis]: 'channel-1',

package/src/wallets/keplr/KeplrWallet.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ export class KeplrWallet implements Wallet {
104104

105105
switch (tx.bridge) {
106106
case BridgeType.ibc:
107-
// @ts-expect-error
108107
if (!ibcChannels[tx.src]?.[tx.dst]) {
109108
return {
110109
success: false,
@@ -116,8 +115,7 @@ export class KeplrWallet implements Wallet {
116115
typeUrl: '/ibc.applications.transfer.v1.MsgTransfer',
117116
value: {
118117
sourcePort: 'transfer',
119-
// @ts-expect-error
120-
sourceChannel: !ibcChannels[tx.src][tx.dst],
118+
sourceChannel: ibcChannels[tx.src][tx.dst],
121119
sender: this.address,
122120
receiver: tx.address,
123121
token: tx.coin,
@@ -127,7 +125,6 @@ export class KeplrWallet implements Wallet {
127125
})
128126
break
129127
case BridgeType.axelar:
130-
// @ts-expect-error
131128
if (!ibcChannels[tx.src]?.axelar) {
132129
return {
133130
success: false,
@@ -146,8 +143,7 @@ export class KeplrWallet implements Wallet {
146143
typeUrl: '/ibc.applications.transfer.v1.MsgTransfer',
147144
value: {
148145
sourcePort: 'transfer',
149-
// @ts-expect-error
150-
sourceChannel: !ibcChannels[tx.src].axelar,
146+
sourceChannel: ibcChannels[tx.src].axelar,
151147
sender: this.address,
152148
receiver: axlAddress,
153149
token: tx.coin,

package/src/wallets/station/StationWallet.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ export class StationWallet implements Wallet {
101101

102102
switch (tx.bridge) {
103103
case BridgeType.ibc:
104-
// @ts-expect-error
105104
if (!ibcChannels[tx.src]?.[tx.dst]) {
106105
return {
107106
success: false,
@@ -113,7 +112,6 @@ export class StationWallet implements Wallet {
113112
msgs: [
114113
new MsgTransfer(
115114
'transfer',
116-
// @ts-expect-error
117115
ibcChannels[tx.src][tx.dst],
118116
new Coin(tx.coin.denom, tx.coin.amount),
119117
this.address,
@@ -152,7 +150,6 @@ export class StationWallet implements Wallet {
152150
msgs: [
153151
new MsgTransfer(
154152
'transfer',
155-
// @ts-expect-error
156153
ibcChannels[tx.src]?.axelar,
157154
new Coin(tx.coin.denom, tx.coin.amount),
158155
this.address,

package/src/wallets/terraLedger/TerraLedgerWallet.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ export class TerraLedgerWallet implements WalletInterface {
115115

116116
switch (tx.bridge) {
117117
case BridgeType.ibc:
118-
// @ts-expect-error
119118
if (!ibcChannels[tx.src]?.[tx.dst]) {
120119
return {
121120
success: false,
@@ -128,7 +127,6 @@ export class TerraLedgerWallet implements WalletInterface {
128127
msgs: [
129128
new MsgTransfer(
130129
'transfer',
131-
// @ts-expect-error
132130
ibcChannels[tx.src][tx.dst],
133131
new Coin(tx.coin.denom, tx.coin.amount),
134132
this.address,
@@ -165,7 +163,6 @@ export class TerraLedgerWallet implements WalletInterface {
165163
msgs: [
166164
new MsgTransfer(
167165
'transfer',
168-
// @ts-expect-error
169166
ibcChannels[tx.src]?.axelar,
170167
new Coin(tx.coin.denom, tx.coin.amount),
171168
this.address,

template/src/LedgerTerra.tsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,18 @@ export default function LedgerTerraWallet() {
5252
>
5353
Connect
5454
</button>
55+
56+
<button
57+
onClick={async () => {
58+
setAddress((await wallet.connect(ChainType.terra, { bluetooth: true })).address)
59+
const balResult = await wallet.getBalance('uluna')
60+
if (balResult.success) {
61+
setBalance(balResult.data)
62+
}
63+
}}
64+
>
65+
Connect Bluetooth
66+
</button>
5567
</>
5668
)}
5769
</section>

0 commit comments

Comments
 (0)