Skip to content
Merged

Ozan #17

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/npm-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
env:
NPM_AUTH_TOKEN: ${{secrets.NPM_AUTH_TOKEN}}

- name: Check if version changed
- name: Publish if version changed
run: |
npm install -g pnpm
pnpm install
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"lint": "eslint . --ext .ts --ignore-path .gitignore"
},
"devDependencies": {
"@rollup/plugin-strip": "^3.0.4",
"@types/node": "^20.11.20",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@vitest/coverage-istanbul": "^1.5.3",
Expand All @@ -23,7 +24,6 @@
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-require-extensions": "^0.1.3",
"jsdom": "^24.0.0",
"prettier": "^3.2.5",
"tsx": "^4.7.1",
Expand Down
6 changes: 1 addition & 5 deletions packages/networks/bitcoin/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
{
"extends": [
"plugin:require-extensions/recommended",
"../../../.eslintrc.json"
],
"plugins": ["require-extensions"]
"extends": ["../../../.eslintrc.json"]
}
2 changes: 1 addition & 1 deletion packages/networks/bitcoin/esbuild.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
void import('../../../esbuild.ts').then((module) => {
void import('../../../esbuild').then((module) => {
module.default()
})
4 changes: 2 additions & 2 deletions packages/networks/bitcoin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@multiplechain/bitcoin",
"version": "0.4.3",
"version": "0.4.4",
"type": "module",
"main": "dist/index.cjs",
"module": "dist/index.es.js",
Expand Down Expand Up @@ -72,7 +72,7 @@
"url": "https://github.com/MultipleChain/js/issues"
},
"dependencies": {
"@multiplechain/types": "^0.1.64",
"@multiplechain/types": "^0.1.66",
"@multiplechain/utils": "^0.1.21",
"axios": "^1.6.8",
"bitcore-lib": "^10.0.28",
Expand Down
8 changes: 4 additions & 4 deletions packages/networks/bitcoin/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/networks/bitcoin/src/assets/Coin.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import axios from 'axios'
import { Provider } from '../services/Provider.ts'
import { fromSatoshi, toSatoshi } from '../utils.ts'
import { Provider } from '../services/Provider'
import { fromSatoshi, toSatoshi } from '../utils'
import { Transaction, Script, Address } from 'bitcore-lib'
import { TransactionSigner } from '../services/TransactionSigner.ts'
import { TransactionSigner } from '../services/TransactionSigner'
import {
ErrorTypeEnum,
type CoinInterface,
Expand Down
2 changes: 1 addition & 1 deletion packages/networks/bitcoin/src/assets/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export * from './Coin.ts'
export * from './Coin'
4 changes: 2 additions & 2 deletions packages/networks/bitcoin/src/browser/Wallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import {
type SignedMessage,
type TransactionId
} from '@multiplechain/types'
import { Provider } from '../services/Provider.ts'
import type { TransactionSigner } from '../services/TransactionSigner.ts'
import { Provider } from '../services/Provider'
import type { TransactionSigner } from '../services/TransactionSigner'

export interface WalletProvider {
getAddress: () => Promise<string>
Expand Down
6 changes: 3 additions & 3 deletions packages/networks/bitcoin/src/browser/adapters/Leather.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import icons from './icons.ts'
import type { WalletProvider } from '../Wallet.ts'
import icons from './icons'
import type { WalletProvider } from '../Wallet'
import { WalletPlatformEnum } from '@multiplechain/types'
import type { Provider } from '../../services/Provider.ts'
import type { Provider } from '../../services/Provider'
import type { WalletAdapterInterface } from '@multiplechain/types'

declare global {
Expand Down
6 changes: 3 additions & 3 deletions packages/networks/bitcoin/src/browser/adapters/UniSat.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import icons from './icons.ts'
import type { WalletProvider } from '../Wallet.ts'
import icons from './icons'
import type { WalletProvider } from '../Wallet'
import { WalletPlatformEnum } from '@multiplechain/types'
import type { Provider } from '../../services/Provider.ts'
import type { Provider } from '../../services/Provider'
import type { WalletAdapterInterface } from '@multiplechain/types'

declare global {
Expand Down
6 changes: 3 additions & 3 deletions packages/networks/bitcoin/src/browser/adapters/Xverse.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import icons from './icons.ts'
import type { WalletProvider } from '../Wallet.ts'
import type { Provider } from '../../services/Provider.ts'
import icons from './icons'
import type { WalletProvider } from '../Wallet'
import type { Provider } from '../../services/Provider'
import {
ErrorTypeEnum,
WalletPlatformEnum,
Expand Down
6 changes: 3 additions & 3 deletions packages/networks/bitcoin/src/browser/adapters/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export { default as UniSat } from './UniSat.ts'
export { default as Xverse } from './Xverse.ts'
export { default as Leather } from './Leather.ts'
export { default as UniSat } from './UniSat'
export { default as Xverse } from './Xverse'
export { default as Leather } from './Leather'
6 changes: 3 additions & 3 deletions packages/networks/bitcoin/src/browser/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Provider } from 'sats-connect'
import { Wallet, type WalletProvider } from './Wallet.ts'
import * as adapterList from './adapters/index.ts'
import { Wallet, type WalletProvider } from './Wallet'
import * as adapterList from './adapters/index'
import type {
WalletAdapterListType,
WalletAdapterInterface,
Expand All @@ -19,7 +19,7 @@ const registerAdapter: RegisterWalletAdapterType<Provider, WalletProvider> = (
adapters[adapter.id] = adapter
}

export * from '../index.ts'
export * from '../index'

export const browser = {
Wallet,
Expand Down
10 changes: 5 additions & 5 deletions packages/networks/bitcoin/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
export * from './services/Provider.ts'
export * from './services/Provider'

export * as assets from './assets/index.ts'
export * as models from './models/index.ts'
export * as services from './services/index.ts'
export * as assets from './assets/index'
export * as models from './models/index'
export * as services from './services/index'

export * as utils from './utils.ts'
export * as utils from './utils'
export * as types from '@multiplechain/types'
4 changes: 2 additions & 2 deletions packages/networks/bitcoin/src/models/CoinTransaction.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { fromSatoshi } from '../utils.ts'
import { Transaction } from './Transaction.ts'
import { fromSatoshi } from '../utils'
import { Transaction } from './Transaction'
import { TransactionStatusEnum, AssetDirectionEnum } from '@multiplechain/types'
import type { WalletAddress, CoinTransactionInterface, TransferAmount } from '@multiplechain/types'

Expand Down
4 changes: 2 additions & 2 deletions packages/networks/bitcoin/src/models/Transaction.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { fromSatoshi, sleep } from '../utils.ts'
import { fromSatoshi, sleep } from '../utils'
import axios, { type AxiosError } from 'axios'
import { Provider } from '../services/Provider.ts'
import { Provider } from '../services/Provider'
import { ErrorTypeEnum, TransactionStatusEnum } from '@multiplechain/types'
import {
TransactionTypeEnum,
Expand Down
4 changes: 2 additions & 2 deletions packages/networks/bitcoin/src/models/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from './Transaction.ts'
export * from './CoinTransaction.ts'
export * from './Transaction'
export * from './CoinTransaction'
8 changes: 4 additions & 4 deletions packages/networks/bitcoin/src/services/TransactionListener.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import type {
TransactionId
} from '@multiplechain/types'
import WebSocket from 'ws'
import { Provider } from './Provider.ts'
import { fromSatoshi } from '../utils.ts'
import { Transaction } from '../models/Transaction.ts'
import { CoinTransaction } from '../models/CoinTransaction.ts'
import { Provider } from './Provider'
import { fromSatoshi } from '../utils'
import { Transaction } from '../models/Transaction'
import { CoinTransaction } from '../models/CoinTransaction'
import { checkWebSocket, objectsEqual } from '@multiplechain/utils'
import { TransactionListenerProcessIndex } from '@multiplechain/types'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import axios from 'axios'
import type { AxiosError } from 'axios'
import { Provider } from '../services/Provider.ts'
import { Provider } from '../services/Provider'
import type { Transaction as BitcoreLibTransactionData } from 'bitcore-lib'
import type { PrivateKey, TransactionId, TransactionSignerInterface } from '@multiplechain/types'

Expand Down
4 changes: 2 additions & 2 deletions packages/networks/bitcoin/src/services/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from './TransactionSigner.ts'
export * from './TransactionListener.ts'
export * from './TransactionSigner'
export * from './TransactionListener'
6 changes: 3 additions & 3 deletions packages/networks/bitcoin/tests/assets.spec.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { describe, it, expect, assert } from 'vitest'

import { Coin } from '../src/assets/Coin.ts'
import { Coin } from '../src/assets/Coin'
import { math } from '@multiplechain/utils'
import { Transaction } from '../src/models/Transaction.ts'
import { Transaction } from '../src/models/Transaction'
import { TransactionStatusEnum, type TransactionId } from '@multiplechain/types'
import { TransactionSigner } from '../src/services/TransactionSigner.ts'
import { TransactionSigner } from '../src/services/TransactionSigner'

const testAmount = Number(process.env.BTC_TRANSFER_AMOUNT)
const senderTestAddress = String(process.env.BTC_SENDER_ADDRESS)
Expand Down
4 changes: 2 additions & 2 deletions packages/networks/bitcoin/tests/models.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { describe, it, expect } from 'vitest'
import { Transaction } from '../src/models/Transaction.ts'
import { CoinTransaction } from '../src/models/CoinTransaction.ts'
import { Transaction } from '../src/models/Transaction'
import { CoinTransaction } from '../src/models/CoinTransaction'
import { AssetDirectionEnum, TransactionStatusEnum } from '@multiplechain/types'

const testAmount = Number(process.env.BTC_TRANSFER_AMOUNT)
Expand Down
10 changes: 5 additions & 5 deletions packages/networks/bitcoin/tests/services.spec.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { describe, it, expect } from 'vitest'

import { provider } from './setup.ts'
import { Provider } from '../src/services/Provider.ts'
import { TransactionListener } from '../src/services/TransactionListener.ts'
import { provider } from './setup'
import { Provider } from '../src/services/Provider'
import { TransactionListener } from '../src/services/TransactionListener'
import { TransactionTypeEnum } from '@multiplechain/types'
import { CoinTransaction } from '../src/models/CoinTransaction.ts'
import { Coin } from '../src/assets/Coin.ts'
import { CoinTransaction } from '../src/models/CoinTransaction'
import { Coin } from '../src/assets/Coin'
import { sleep } from '@multiplechain/utils'

const senderTestAddress = String(process.env.BTC_SENDER_ADDRESS)
Expand Down
2 changes: 1 addition & 1 deletion packages/networks/bitcoin/tests/setup.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Provider } from '../src/services/Provider.ts'
import { Provider } from '../src/services/Provider'

let provider: Provider

Expand Down
2 changes: 1 addition & 1 deletion packages/networks/bitcoin/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { mergeConfig } from 'vite'
import mainConfig from '../../../vite.config.ts'
import mainConfig from '../../../vite.config'

export default mergeConfig(mainConfig, {
build: {
Expand Down
2 changes: 1 addition & 1 deletion packages/networks/bitcoin/vitest.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { mergeConfig, defineConfig } from 'vitest/config'
import mainConfig from '../../../vite.config.ts'
import mainConfig from '../../../vite.config'

export default mergeConfig(
mainConfig,
Expand Down
6 changes: 1 addition & 5 deletions packages/networks/boilerplate/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
{
"extends": [
"plugin:require-extensions/recommended",
"../../../.eslintrc.json"
],
"plugins": ["require-extensions"]
"extends": ["../../../.eslintrc.json"]
}
2 changes: 1 addition & 1 deletion packages/networks/boilerplate/esbuild.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
void import('../../../esbuild.ts').then((module) => {
void import('../../../esbuild').then((module) => {
module.default()
})
2 changes: 1 addition & 1 deletion packages/networks/boilerplate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"url": "https://github.com/MultipleChain/js/issues"
},
"dependencies": {
"@multiplechain/types": "^0.1.64",
"@multiplechain/types": "^0.1.66",
"@multiplechain/utils": "^0.1.21"
}
}
8 changes: 4 additions & 4 deletions packages/networks/boilerplate/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/networks/boilerplate/src/assets/Coin.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Provider } from '../services/Provider.ts'
import { TransactionSigner } from '../services/TransactionSigner.ts'
import { Provider } from '../services/Provider'
import { TransactionSigner } from '../services/TransactionSigner'
import type { CoinInterface, TransferAmount, WalletAddress } from '@multiplechain/types'

export class Coin implements CoinInterface<TransactionSigner> {
Expand Down
2 changes: 1 addition & 1 deletion packages/networks/boilerplate/src/assets/Contract.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Provider } from '../services/Provider.ts'
import { Provider } from '../services/Provider'
import type { ContractAddress, ContractInterface, WalletAddress } from '@multiplechain/types'

export class Contract implements ContractInterface {
Expand Down
4 changes: 2 additions & 2 deletions packages/networks/boilerplate/src/assets/NFT.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Contract } from './Contract.ts'
import { TransactionSigner } from '../services/TransactionSigner.ts'
import { Contract } from './Contract'
import { TransactionSigner } from '../services/TransactionSigner'
import type { NftId, NftInterface, WalletAddress } from '@multiplechain/types'

export class NFT extends Contract implements NftInterface<TransactionSigner> {
Expand Down
4 changes: 2 additions & 2 deletions packages/networks/boilerplate/src/assets/Token.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Contract } from './Contract.ts'
import { TransactionSigner } from '../services/TransactionSigner.ts'
import { Contract } from './Contract'
import { TransactionSigner } from '../services/TransactionSigner'
import type { TokenInterface, TransferAmount, WalletAddress } from '@multiplechain/types'

export class Token extends Contract implements TokenInterface<TransactionSigner> {
Expand Down
8 changes: 4 additions & 4 deletions packages/networks/boilerplate/src/assets/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export * from './NFT.ts'
export * from './Coin.ts'
export * from './Token.ts'
export * from './Contract.ts'
export * from './NFT'
export * from './Coin'
export * from './Token'
export * from './Contract'
4 changes: 2 additions & 2 deletions packages/networks/boilerplate/src/browser/Wallet.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Provider } from '../services/Provider.ts'
import type { TransactionSigner } from '../services/TransactionSigner.ts'
import { Provider } from '../services/Provider'
import type { TransactionSigner } from '../services/TransactionSigner'
import type {
WalletInterface,
WalletAdapterInterface,
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as Example } from './Example.ts'
export { default as Example } from './Example'
Loading