Skip to content

Commit ba75365

Browse files
authored
Merge pull request #34 from MultipleChain/alpha
Alpha
2 parents 9ff8e8f + a6aeee3 commit ba75365

10 files changed

Lines changed: 26 additions & 15 deletions

File tree

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ TON_COIN_TRANSFER_TEST_IS_ACTIVE=false
153153
TON_TOKEN_TRANSFER_TEST_IS_ACTIVE=false
154154
TON_TOKEN_APPROVE_TEST_IS_ACTIVE=false
155155
TON_TOKEN_TRANSFER_FROM_TEST_IS_ACTIVE=false
156-
TON_NFT_TRANSACTION_TEST_IS_ACTIVE=true
156+
TON_NFT_TRANSACTION_TEST_IS_ACTIVE=false
157157
TON_TRANSACTION_LISTENER_TEST_IS_ACTIVE=false
158158

159159
TON_COIN_BALANCE_TEST_AMOUNT=0.199996009

packages/networks/bitcoin/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@multiplechain/bitcoin",
3-
"version": "0.4.15",
3+
"version": "0.4.18",
44
"type": "module",
55
"main": "dist/index.cjs",
66
"module": "dist/index.es.js",

packages/networks/evm-chains/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@multiplechain/evm-chains",
3-
"version": "0.4.15",
3+
"version": "0.4.18",
44
"type": "module",
55
"main": "dist/index.cjs",
66
"module": "dist/index.es.js",

packages/networks/solana/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@multiplechain/solana",
3-
"version": "0.4.16",
3+
"version": "0.4.18",
44
"type": "module",
55
"main": "dist/index.cjs",
66
"module": "dist/index.es.js",

packages/networks/solana/src/models/Transaction.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,11 @@ export class Transaction implements TransactionInterface<ParsedTransactionWithMe
221221
return TransactionStatusEnum.PENDING
222222
}
223223

224-
return data.meta?.err !== null
225-
? TransactionStatusEnum.FAILED
226-
: TransactionStatusEnum.CONFIRMED
224+
if (data.meta?.err !== null) {
225+
console.error('MC Solana TX getStatus', data.meta?.err)
226+
return TransactionStatusEnum.FAILED
227+
} else {
228+
return TransactionStatusEnum.CONFIRMED
229+
}
227230
}
228231
}

packages/networks/ton/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@multiplechain/ton",
3-
"version": "0.1.10",
3+
"version": "0.1.11",
44
"type": "module",
55
"main": "dist/index.cjs",
66
"module": "dist/index.es.js",

packages/networks/ton/tests/assets.spec.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const nftTransactionTestIsActive = Boolean(
3030

3131
const balanceTestAddress = String(process.env.TON_BALANCE_TEST_ADDRESS)
3232
const senderPrivateKey = String(process.env.TON_SENDER_SEED_PHRASE)
33-
// const receiverPrivateKey = String(process.env.TON_RECEIVER_SEED_PHRASE)
33+
const receiverPrivateKey = String(process.env.TON_RECEIVER_SEED_PHRASE)
3434
const senderTestAddress = String(process.env.TON_SENDER_ADDRESS)
3535
const receiverTestAddress = String(process.env.TON_RECEIVER_ADDRESS)
3636
const tokenTestAddress = String(process.env.TON_TOKEN_TEST_ADDRESS)
@@ -226,6 +226,14 @@ describe('Nft', () => {
226226
await checkTx(await signer.send())
227227

228228
expect(await nft.getOwner(nftTransferId)).toBe(receiverTestAddress)
229+
230+
const signer2 = await nft.transfer(receiverTestAddress, senderTestAddress, nftTransferId)
231+
232+
await checkSigner(signer2, receiverPrivateKey)
233+
234+
await waitForSec(5)
235+
236+
await checkTx(await signer2.send())
229237
})
230238

231239
// it('Approve', async () => {

packages/networks/tron/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@multiplechain/tron",
3-
"version": "0.4.16",
3+
"version": "0.4.18",
44
"type": "module",
55
"main": "dist/index.cjs",
66
"module": "dist/index.es.js",

packages/networks/xrpl/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@multiplechain/xrpl",
3-
"version": "0.1.0",
3+
"version": "0.1.2",
44
"type": "module",
55
"main": "dist/index.cjs",
66
"module": "dist/index.es.js",

packages/networks/xrpl/src/services/Client.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default class Client {
3636
return result.info.validated_ledger.reserve_base_xrp
3737
}
3838

39-
async getAccountInfo(address: string): Promise<AccountInfoResponse | ErrorResponse> {
39+
async getAccountInfo(address: string): Promise<AccountInfoResponse> {
4040
return await this.request('account_info', {
4141
account: address,
4242
ledger_index: 'validated'
@@ -48,13 +48,13 @@ export default class Client {
4848
}
4949

5050
async getBalance(address: string): Promise<string> {
51-
const response = await this.getAccountInfo(address)
51+
const { result } = await this.getAccountInfo(address)
5252

53-
if (this.isError(response)) {
53+
if (this.isError(result)) {
5454
return '0'
5555
}
5656

57-
return response.result.account_data.Balance
57+
return result.account_data.Balance
5858
}
5959

6060
async getLedger(): Promise<LedgerResponse> {

0 commit comments

Comments
 (0)