Skip to content
Merged
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
728 changes: 86 additions & 642 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/TBC20/test/token.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ const sender = new Computer({ url, chain, network })
const receiver = new Computer({ url, chain, network })

before(async () => {
await sender.faucet(1e8)
await receiver.faucet(1e8)
await sender.faucet(10e8)
await receiver.faucet(10e8)
})

describe('Token', async () => {
Expand Down
8 changes: 4 additions & 4 deletions packages/TBC721/test/nft.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ describe('NFT', () => {
const sender = new Computer({ url, chain, network })

before("Fund sender's wallet", async () => {
await sender.faucet(0.001e8)
await sender.faucet(1e8)
})

it('Sender mints an NFT', async () => {
Expand Down Expand Up @@ -109,7 +109,7 @@ describe('NFT', () => {
let nft: NFT

before(async () => {
await computer.faucet(1e7)
await computer.faucet(1e8)
})

describe('Constructor', () => {
Expand Down Expand Up @@ -163,7 +163,7 @@ describe('NFT', () => {
const sender = new Computer({ url, chain, network })

// Fund the senders wallet
await sender.faucet(0.001e8)
await sender.faucet(1e8)

// Create a new NFT
const nft = await sender.new(NFT, [sender.getPublicKey(), 'Test'])
Expand All @@ -177,7 +177,7 @@ describe('NFT', () => {
const sender = new Computer({ url, chain, network })

// Fund wallet
await sender.faucet(0.001e8)
await sender.faucet(1e8)

// Create helper object
const nftHelper = new NftHelper(sender)
Expand Down
4 changes: 2 additions & 2 deletions packages/chess-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"type": "module",
"scripts": {
"build": "tsc -b && vite build",
"build-turbo": "turbo run build",
"build:contract": "tsc --project tsconfig.build.json && mv ./build-contract/chess-module.js ./src/contracts/chess.mjs && rm -rf build-contract",
"build:turbo": "turbo run build",
"deploy": "npm run build:contract && node --loader ts-node/esm ./scripts/deploy.ts",
"dev": "vite",
"format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,css,scss,md}\"",
Expand All @@ -18,9 +18,9 @@
"test:dev": "vitest"
},
"dependencies": {
"@bitcoin-computer/chess-contracts": "^0.23.0-beta.0",
"@bitcoin-computer/components": "^0.23.0-beta.0",
"@bitcoin-computer/lib": "^0.23.0-beta.0",
"@bitcoin-computer/chess-contracts": "^0.23.0-beta.0",
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
"buffer": "^6.0.3",
"crypto-browserify": "^3.12.0",
Expand Down
20 changes: 10 additions & 10 deletions packages/chess-contracts/package.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
{
"name": "@bitcoin-computer/chess-contracts",
"version": "0.23.0-beta.0",
"type": "module",
"main": "./build/index.js",
"module": "./build/index.js",
"description": "Contracts for an on-chain Chess game.",
"types": "./build/index.d.ts",
"license": "MIT",
"author": "Clemens Ley <clemens@bitcoincomputer.io>",
"type": "module",
"exports": {
".": "./build/index.js"
},
"main": "./build/index.js",
"module": "./build/index.js",
"types": "./build/index.d.ts",
"scripts": {
"prebuild": "npm run lint",
"build": "tsc -p tsconfig.json",
"build-turbo": "turbo run build",
"clean-logs": "rm -f *.log 2> /dev/null",
"build:turbo": "turbo run build",
"clean:logs": "rm -f *.log 2> /dev/null",
"lint": "eslint .",
"prebuild": "npm run lint",
"start": "node build/src/index.js",
"test": "mocha --config .mocharc.json",
"test-and-show": "npm run test 2>&1 | tee nodejs-template.log && open nodejs-template.log",
"test:show": "npm run test 2>&1 | tee chess-contracts.log && open chess-contracts.log",
"types": "tsc --noEmit"
},
"dependencies": {
Expand All @@ -38,8 +40,6 @@
"ts-node": "^10.9.2",
"tslib": "~2.6.2"
},
"author": "Clemens Ley <clemens@bitcoincomputer.io>",
"license": "MIT",
"volta": {
"node": "16.13.0"
},
Expand Down
12 changes: 5 additions & 7 deletions packages/chess-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,18 @@
"private": true,
"type": "module",
"scripts": {
"build-docker": "docker build -t chess-server .",
"build:docker": "docker build -t chess-app-server .",
"clean": "rm -rf db/db-data",
"create:migration": "migrate create",
"deploy": "node --loader ts-node/esm ./scripts/deploy.ts",
"lint": "tslint -p tsconfig.json --fix",
"migrate": "migrate up",
"rollback": "migrate down",
"create-migration": "migrate create",
"lint": "tslint -p tsconfig.json --fix",
"start-postgres": "docker compose up postgres",
"build-docker": "docker build -t chess-server .",
"clean": "rm -rf db/db-data",
"test": "POSTGRES_HOST=127.0.0.1 BITCOIN_RPC_HOST=127.0.0.1 BCN_ZMQ_URL=tcp://127.0.0.1:28332 mocha -r ts-node/register --loader=ts-node/esm --timeout=30000000 test/**/*.test.ts test/*.test.ts",
"deploy": "node --loader ts-node/esm ./scripts/deploy.ts",
"start": "node --loader ts-node/esm.mjs -r tsconfig-paths/register src/app.ts",
"start:dev": "nodemon --exec npm run start -- --ext ts",
"start:postgres": "docker-compose up postgres",
"test": "POSTGRES_HOST=127.0.0.1 BITCOIN_RPC_HOST=127.0.0.1 BCN_ZMQ_URL=tcp://127.0.0.1:28332 mocha -r ts-node/register --loader=ts-node/esm --timeout=30000000 test/**/*.test.ts test/*.test.ts",
"up": "docker-compose up"
},
"dependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/explorer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
"build": "tsc -b && vite build",
"build:turbo": "turbo run build",
"dev": "vite",
"format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,css,scss,md}\"",
"lint": "eslint .",
"lint:fix": "eslint . --fix",
"preview": "vite preview",
"start": "vite",
"test": "vitest run",
"types": "tsc --noEmit",
"format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,css,scss,md}\"",
"test:dev": "vitest"
"test:dev": "vitest",
"types": "tsc --noEmit"
},
"dependencies": {
"@bitcoin-computer/components": "^0.23.0-beta.0",
Expand Down
20 changes: 10 additions & 10 deletions packages/lib/dist/bc-lib.browser.min.mjs

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions packages/lib/dist/bc-lib.commonjs.min.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/lib/dist/bc-lib.main.es.mjs

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions packages/lib/dist/bc-lib.module.es.mjs

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions packages/lib/test/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ describe('Non-Fungible Token (NFT)', () => {
let receiver = new Computer({ chain, network, url })

before("Fund sender's wallet", async () => {
await sender.faucet(0.001e8)
await sender.faucet(1e8)
})

describe('Minting an NFT', () => {
Expand Down Expand Up @@ -227,7 +227,7 @@ describe('Fungible Token', () => {
let receiver = new Computer({ chain, network, url })

before('Fund senders wallet', async () => {
await sender.faucet(0.01e8)
await sender.faucet(1e8)
})

describe('Minting a fungible token', () => {
Expand Down Expand Up @@ -310,8 +310,8 @@ describe('Chat', () => {
const publicKeys = [alice.getPublicKey(), bob.getPublicKey()].sort()

before('Before', async () => {
await alice.faucet(0.01e8)
await bob.faucet(0.01e8)
await alice.faucet(1e8)
await bob.faucet(1e8)
})

describe('Creating a chat', () => {
Expand Down Expand Up @@ -396,8 +396,8 @@ describe('Swap', () => {
const bob = new Computer({ chain, network, url })

before('Before', async () => {
await alice.faucet(0.01e8)
await bob.faucet(0.001e8)
await alice.faucet(1e8)
await bob.faucet(1e8)
})

describe('Creating two NFTs to be swapped', () => {
Expand Down Expand Up @@ -462,16 +462,16 @@ describe('Sell', () => {
let tx: any
let txClone: any
let sellerPublicKey: string
const nftPrice = 0.1e8
const fee = 100000
const nftPrice = 1e8
const fee = 10000

describe('Creating an NFT and an offer to sell', () => {
let nft: NFT
const seller = new Computer({ chain, network, url })
sellerPublicKey = seller.getPublicKey()

before("Fund Seller's wallet", async () => {
await seller.faucet(1e7)
await seller.faucet(1e8)
})

it('Seller creates an NFT', async () => {
Expand Down Expand Up @@ -553,7 +553,7 @@ describe('Sell', () => {
expect(true).eq(false)
} catch (err) {
if (err instanceof Error)
expect(err.message).eq(
expect(err.message).contains(
'mandatory-script-verify-flag-failed (Signature must be zero for failed CHECK(MULTI)SIG operation)',
)
}
Expand All @@ -567,7 +567,7 @@ describe('Sell', () => {
let txId: string

before("Fund Buyers's wallet", async () => {
await buyer.faucet(nftPrice + fee)
await buyer.faucet(nftPrice + fee+ 1e8)
})

it('Buyer creates a payment object', async () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/nakamotojs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
],
"scripts": {
"audit": "better-npm-audit audit -l high",
"build": "npm run clean && tsc -p ./tsconfig.json && npm run formatjs",
"build": "npm run clean && tsc -p ./tsconfig.json && npm run formatjs && npm run build:tests",
"build:tests": "npm run clean:jstests && tsc -p ./test/tsconfig.json",
"build:turbo": "turbo run build",
"clean": "rimraf src",
Expand Down
3 changes: 3 additions & 0 deletions packages/nakamotojs/src/networks.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ export declare const litecointestnet: Network;
export declare const pepecoin: Network;
export declare const pepecoinregtest: Network;
export declare const pepecointestnet: Network;
export declare const dogecoin: Network;
export declare const dogecoinregtest: Network;
export declare const dogecointestnet: Network;
export declare function getNetwork(chain: string, network: string): Network;
export declare const NETWORKS: Record<string, any>;
export {};
48 changes: 48 additions & 0 deletions packages/nakamotojs/src/networks.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,39 @@ export const pepecointestnet = {
scriptHash: 0xc4,
wif: 0xf1,
};
export const dogecoin = {
messagePrefix: '\x19Dogecoin Signed Message:\n',
bech32: 'doge', // TODO: Dogecoin doesn't use bech32, make type optional
bip32: {
public: 0x02facafd,
private: 0x02fac398,
},
pubKeyHash: 0x1e,
scriptHash: 0x16,
wif: 0x9e,
};
export const dogecoinregtest = {
messagePrefix: '\x19Dogecoin Signed Message:\n',
bech32: 'rdoge',
bip32: {
public: 0x043587cf,
private: 0x04358394,
},
pubKeyHash: 0x6f,
scriptHash: 0xc4,
wif: 0xef,
};
export const dogecointestnet = {
messagePrefix: '\x19Dogecoin Signed Message:\n',
bech32: 'tdoge',
bip32: {
public: 0x0432a9a8,
private: 0x0432a243,
},
pubKeyHash: 0x71,
scriptHash: 0xc4,
wif: 0xf1,
};
export function getNetwork(chain, network) {
switch (chain) {
case 'BTC':
Expand Down Expand Up @@ -132,6 +165,17 @@ export function getNetwork(chain, network) {
default:
throw new Error(`Invalid network ${network}`);
}
case 'DOGE':
switch (network) {
case 'mainnet':
return dogecoin;
case 'testnet':
return dogecointestnet;
case 'regtest':
return dogecoinregtest;
default:
throw new Error(`Invalid network ${network}`);
}
default:
throw new Error(`Invalid chain ${network}`);
}
Expand All @@ -149,4 +193,8 @@ export const NETWORKS = {
pepecoin,
pepecoinregtest,
pepecointestnet,
// Dogecoin
dogecoin,
dogecoinregtest,
dogecointestnet,
};
50 changes: 50 additions & 0 deletions packages/nakamotojs/ts_src/networks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,41 @@ export const pepecointestnet: Network = {
wif: 0xf1,
};

export const dogecoin: Network = {
messagePrefix: '\x19Dogecoin Signed Message:\n',
bech32: 'doge', // TODO: Dogecoin doesn't use bech32, make type optional
bip32: {
public: 0x02facafd,
private: 0x02fac398,
},
pubKeyHash: 0x1e,
scriptHash: 0x16,
wif: 0x9e,
};

export const dogecoinregtest: Network = {
messagePrefix: '\x19Dogecoin Signed Message:\n',
bech32: 'rdoge',
bip32: {
public: 0x043587cf,
private: 0x04358394,
},
pubKeyHash: 0x6f,
scriptHash: 0xc4,
wif: 0xef,
};

export const dogecointestnet: Network = {
messagePrefix: '\x19Dogecoin Signed Message:\n',
bech32: 'tdoge',
bip32: {
public: 0x0432a9a8,
private: 0x0432a243,
},
pubKeyHash: 0x71,
scriptHash: 0xc4,
wif: 0xf1,
};
export function getNetwork(chain: string, network: string): Network {
switch (chain) {
case 'BTC':
Expand Down Expand Up @@ -157,6 +192,17 @@ export function getNetwork(chain: string, network: string): Network {
default:
throw new Error(`Invalid network ${network}`);
}
case 'DOGE':
switch (network) {
case 'mainnet':
return dogecoin;
case 'testnet':
return dogecointestnet;
case 'regtest':
return dogecoinregtest;
default:
throw new Error(`Invalid network ${network}`);
}
default:
throw new Error(`Invalid chain ${network}`);
}
Expand All @@ -175,4 +221,8 @@ export const NETWORKS: Record<string, any> = {
pepecoin,
pepecoinregtest,
pepecointestnet,
// Dogecoin
dogecoin,
dogecoinregtest,
dogecointestnet,
};
Loading