diff --git a/packages/cli/package.json b/packages/cli/package.json index ceb99290..e8147b71 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -28,7 +28,7 @@ "@nestjs/common": "^10.0.0", "@nestjs/core": "^10.0.0", "@nestjs/platform-express": "^10.0.0", - "@cat-protocol/cat-smartcontracts": "0.1.0", + "@cat-protocol/cat-smartcontracts": "0.1.2", "@types/inquirer": "^8.1.3", "bigi": "^1.4.2", "bip32": "^4.0.0", diff --git a/packages/smartcontracts/package.json b/packages/smartcontracts/package.json index 7b96e586..16305216 100644 --- a/packages/smartcontracts/package.json +++ b/packages/smartcontracts/package.json @@ -1,15 +1,14 @@ { "name": "@cat-protocol/cat-smartcontracts", - "version": "0.1.1", + "version": "0.1.2", "description": "CAT protocol smart contracts.", "author": "", "main": "./dist/index.js", "types": "./dist/index.d.ts", "scripts": { - "prebuild": "npm run clean", + "prebuild": "npm run clean && npm run compile", "prepublishOnly": "npm run build", "build": "tsc", - "postbuild": "npm run compile", "deploy": "npx ts-node ./deploy.ts", "clean": "rimraf scrypt.index.json && rimraf dist && rimraf artifacts", "compile": "npx scrypt-cli compile", @@ -39,12 +38,12 @@ "ecurve": "^1.0.6", "bitcore-lib-inquisition": "^10.0.30", "js-sha256": "^0.9.0", - "bigi": "^1.4.2" - }, - "devDependencies": { + "bigi": "^1.4.2", "@cmdcode/buff": "^2.2.4", "@cmdcode/crypto-tools": "^2.7.4", - "@cmdcode/tapscript": "^1.4.4", + "@cmdcode/tapscript": "^1.4.4" + }, + "devDependencies": { "@types/chai": "^4.3.4", "@types/chai-as-promised": "^7.1.5", "@types/ecurve": "^1.0.3", diff --git a/packages/smartcontracts/src/index.ts b/packages/smartcontracts/src/index.ts index ea9c87f9..396511f6 100644 --- a/packages/smartcontracts/src/index.ts +++ b/packages/smartcontracts/src/index.ts @@ -5,25 +5,21 @@ import { OpenMinter } from './contracts/token/openMinter' import { CAT20 } from './contracts/token/cat20' import { TransferGuard } from './contracts/token/transferGuard' import { OpenMinterV2 } from './contracts/token/openMinterV2' + +import closedMinter from '../artifacts/contracts/token/closedMinter.json' +import openMinter from '../artifacts/contracts/token/openMinter.json' +import openMinterV2 from '../artifacts/contracts/token/openMinterV2.json' +import cat20 from '../artifacts/contracts/token/cat20.json' +import burnGuard from '../artifacts/contracts/token/burnGuard.json' +import transferGuard from '../artifacts/contracts/token/transferGuard.json' + (() => { - ClosedMinter.loadArtifact( - join(__dirname, '..', 'artifacts/contracts/token/closedMinter.json') - ) - OpenMinter.loadArtifact( - join(__dirname, '..', 'artifacts/contracts/token/openMinter.json') - ) - OpenMinterV2.loadArtifact( - join(__dirname, '..', 'artifacts/contracts/token/openMinterV2.json') - ) - CAT20.loadArtifact( - join(__dirname, '..', 'artifacts/contracts/token/cat20.json') - ) - BurnGuard.loadArtifact( - join(__dirname, '..', 'artifacts/contracts/token/burnGuard.json') - ) - TransferGuard.loadArtifact( - join(__dirname, '..', 'artifacts/contracts/token/transferGuard.json') - ) + ClosedMinter.loadArtifact(closedMinter) + OpenMinter.loadArtifact(openMinter) + OpenMinterV2.loadArtifact(openMinterV2) + CAT20.loadArtifact(cat20) + BurnGuard.loadArtifact(burnGuard) + TransferGuard.loadArtifact(transferGuard) })() export * from './contracts/token/closedMinter' export * from './contracts/token/cat20' diff --git a/packages/smartcontracts/tsconfig.json b/packages/smartcontracts/tsconfig.json index 50ad2601..1faefecd 100644 --- a/packages/smartcontracts/tsconfig.json +++ b/packages/smartcontracts/tsconfig.json @@ -6,6 +6,7 @@ "rootDir": "./src", // Todo remove below "noImplicitAny": false, + "resolveJsonModule": true, "strict": false /* Enable all strict type-checking options. */, }, "include": [ diff --git a/packages/tracker/package.json b/packages/tracker/package.json index e4ff2011..1460b21e 100644 --- a/packages/tracker/package.json +++ b/packages/tracker/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@bitcoin-js/tiny-secp256k1-asmjs": "^2.2.3", - "@cat-protocol/cat-smartcontracts": "^0.1.0", + "@cat-protocol/cat-smartcontracts": "0.1.2", "@nestjs/common": "^10.0.0", "@nestjs/config": "^3.2.3", "@nestjs/core": "^10.0.0",