Skip to content

Commit c94658c

Browse files
rkalisrkalis
committed
Update most dependencies
1 parent 4f47ba5 commit c94658c

File tree

10 files changed

+2187
-1721
lines changed

10 files changed

+2187
-1721
lines changed

‎.cspell.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@
204204
"branchup",
205205
"bchguru",
206206
"bchn",
207+
"c0ffee",
207208
"cashcompiler",
208209
"cashninjas",
209210
"chaingraph",
@@ -271,5 +272,10 @@
271272
"**/grammar/**",
272273
// Do not spellcheck vendor code
273274
"**/node_modules/**",
275+
],
276+
"ignoreRegExpList": [
277+
"bitcoincash:.*",
278+
"bchreg:.*",
279+
"bchtest:.*"
274280
]
275281
}

‎examples/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
},
1313
"dependencies": {
1414
"@bitauth/libauth": "^3.1.0-next.2",
15-
"@types/node": "^12.7.8",
15+
"@types/node": "^22.10.7",
1616
"cashc": "^0.11.0-next.0",
1717
"cashscript": "^0.11.0-next.0",
1818
"eslint": "^8.56.0",
19-
"typescript": "^4.9.5"
19+
"typescript": "^5.7.3"
2020
}
2121
}

‎examples/testing-suite/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
"url-join": "^5.0.0"
3232
},
3333
"devDependencies": {
34-
"@jest/globals": "^29.4.1",
35-
"@types/jest": "^29.4.1",
36-
"jest": "^29.4.1",
37-
"tsx": "^4.7.2",
38-
"typescript": "^4.9.5"
34+
"@jest/globals": "^29.7.0",
35+
"@types/jest": "^29.5.14",
36+
"jest": "^29.7.0",
37+
"tsx": "^4.19.2",
38+
"typescript": "^5.7.3"
3939
}
4040
}

‎package.json‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,22 @@
99
],
1010
"devDependencies": {
1111
"@jest/reporters": "^26.6.2",
12-
"@types/jest": "^29.4.0",
13-
"@types/node": "^14.14.28",
12+
"@types/jest": "^29.5.14",
13+
"@types/node": "^22.10.7",
1414
"@typescript-eslint/eslint-plugin": "^7.0.0",
1515
"@typescript-eslint/parser": "^7.0.0",
16-
"chalk": "^4.1.0",
17-
"codecov": "^3.8.1",
18-
"cspell": "^5.2.4",
16+
"cspell": "^8.17.2",
1917
"eslint": "^8.54.0",
2018
"eslint-config-airbnb-typescript": "^18.0.0",
21-
"eslint-plugin-import": "^2.29.1",
19+
"eslint-plugin-import": "^2.31.0",
2220
"lerna": "^3.22.1",
23-
"tsx": "^4.7.2",
24-
"typescript": "^5.5.4"
21+
"tsx": "^4.19.2",
22+
"typescript": "^5.7.3"
2523
},
2624
"scripts": {
2725
"test": "lerna run test --ignore cashscript-examples --ignore testing-suite",
2826
"lint": "lerna run lint --ignore cashscript-examples --ignore testing-suite",
2927
"examples": "tsx examples/p2pkh.ts && tsx examples/transfer_with_timeout.ts && tsx examples/hodl_vault.ts",
30-
"coverage": "codecov",
3128
"postinstall": "lerna bootstrap && yarn build",
3229
"spellcheck": "cspell lint '**' --no-progress --must-find-files",
3330
"update-version": "tsx update-version.ts",

‎packages/cashc/package.json‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,21 @@
5151
"dependencies": {
5252
"@bitauth/libauth": "^3.1.0-next.2",
5353
"@cashscript/utils": "^0.11.0-next.0",
54-
"antlr4": "^4.13.1-patch-1",
55-
"commander": "^7.1.0",
54+
"antlr4": "^4.13.2",
55+
"commander": "^13.1.0",
5656
"semver": "^7.6.3"
5757
},
5858
"devDependencies": {
59-
"@jest/globals": "^29.4.1",
60-
"@types/node": "^18.11.18",
59+
"@jest/globals": "^29.7.0",
60+
"@types/jest": "^29.5.14",
61+
"@types/node": "^22.10.7",
6162
"@types/semver": "^7.5.8",
62-
"cpy-cli": "^4.2.0",
63+
"cpy-cli": "^5.0.0",
6364
"eslint": "^8.54.0",
64-
"jest": "^29.4.1",
65-
"typescript": "^5.5.4",
65+
"eslint-plugin-import": "^2.31.0",
66+
"jest": "^29.7.0",
67+
"tsx": "^4.19.2",
68+
"typescript": "^5.7.3",
6669
"url-join": "^5.0.0"
6770
},
6871
"gitHead": "bf02a4b641d5d03c035d052247a545109c17b708"

‎packages/cashc/src/cashc-cli.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ program
1919
.storeOptionsAsProperties(false)
2020
.name('cashc')
2121
.version(version, '-V, --version', 'Output the version number.')
22-
.usage('[options] [source_file]')
22+
.argument('<source_file>', 'The source file to compile.')
2323
.option('-o, --output <path>', 'Specify a file to output the generated artifact.')
2424
.option('-h, --hex', 'Compile the contract to hex format rather than a full artifact.')
2525
.option('-A, --asm', 'Compile the contract to ASM format rather than a full artifact.')

‎packages/cashc/x.json‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
export default {
2+
contractName: 'Mecenas',
3+
constructorInputs: [
4+
{
5+
name: 'recipient',
6+
type: 'bytes20',
7+
},
8+
{
9+
name: 'funder',
10+
type: 'bytes20',
11+
},
12+
{
13+
name: 'pledge',
14+
type: 'int',
15+
},
16+
],
17+
abi: [
18+
{
19+
name: 'receive',
20+
inputs: [],
21+
},
22+
{
23+
name: 'reclaim',
24+
inputs: [
25+
{
26+
name: 'pk',
27+
type: 'pubkey',
28+
},
29+
{
30+
name: 's',
31+
type: 'sig',
32+
},
33+
],
34+
},
35+
],
36+
bytecode: 'OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF OP_0 OP_OUTPUTBYTECODE 76a914 OP_ROT OP_CAT 88ac OP_CAT OP_EQUALVERIFY e803 OP_INPUTINDEX OP_UTXOVALUE OP_DUP OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB OP_DUP OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF OP_0 OP_OUTPUTVALUE OP_2OVER OP_SWAP OP_SUB OP_NUMEQUALVERIFY OP_ELSE OP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUALVERIFY OP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUALVERIFY OP_1 OP_OUTPUTVALUE OP_OVER OP_NUMEQUALVERIFY OP_ENDIF OP_2DROP OP_2DROP OP_2DROP OP_1 OP_ELSE OP_3 OP_ROLL OP_1 OP_NUMEQUALVERIFY OP_3 OP_PICK OP_HASH160 OP_ROT OP_EQUALVERIFY OP_2SWAP OP_CHECKSIG OP_NIP OP_NIP OP_ENDIF',
37+
source: 'pragma cashscript >=0.10.0;\n\n/* This is an unofficial CashScript port of Licho\'s Mecenas contract. It is\n * not compatible with Licho\'s EC plugin, but rather meant as a demonstration\n * of covenants in CashScript.\n * The time checking has been removed so it can be tested without time requirements.\n */\ncontract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */) {\n function receive() {\n // require(tx.age >= period);\n\n // Check that the first output sends to the recipient\n require(tx.outputs[0].lockingBytecode == new LockingBytecodeP2PKH(recipient));\n\n int minerFee = 1000;\n int currentValue = tx.inputs[this.activeInputIndex].value;\n int changeValue = currentValue - pledge - minerFee;\n\n // If there is not enough left for *another* pledge after this one, we send the remainder to the recipient\n // Otherwise we send the remainder to the recipient and the change back to the contract\n if (changeValue <= pledge + minerFee) {\n require(tx.outputs[0].value == currentValue - minerFee);\n } else {\n require(tx.outputs[0].value == pledge);\n require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode);\n require(tx.outputs[1].value == changeValue);\n }\n }\n\n function reclaim(pubkey pk, sig s) {\n require(hash160(pk) == funder);\n require(checkSig(s, pk));\n }\n}\n',
38+
debug: {
39+
bytecode: '5379009c6300cd0376a914527a7e0288ac7e876902e803c0c6007954799452799400795579547993a16300cc52795479949c696700cc55799c6951cdc0c7876951cc51799c69685177777777777767537a519c695379a9527a8769537a537aac777768',
40+
sourceMap: '9:4:28:5;;;;;13:27:13:28;:16::45:1;:49::84:0;:74::83;;:49::84:1;;;:16;:8::86;15:23:15:27:0;16:37:16:58;:27::65:1;17:26:17:38:0;;:41::47;;:26:::1;:50::58:0;;:26:::1;21:12:21:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:23:9:0;22:31:22:32;:20::39:1;:43::55:0;;:58::66;;:43:::1;:20;:12::68;23:15:27:9:0;24:31:24:32;:20::39:1;:43::49:0;;:20:::1;:12::51;25:31:25:32:0;:20::49:1;:63::84:0;:53::101:1;:20;:12::103;26:31:26:32:0;:20::39:1;:43::54:0;;:20:::1;:12::56;23:15:27:9;9:4:28:5;;;;;;;;30::33::0;;;;;31:24:31:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;32:25:32:26:0;;:28::30;;:16::31:1;30:4:33:5;;8:0:34:1',
41+
logs: [],
42+
requires: [
43+
{
44+
ip: 17,
45+
line: 13,
46+
},
47+
{
48+
ip: 46,
49+
line: 22,
50+
},
51+
{
52+
ip: 53,
53+
line: 24,
54+
},
55+
{
56+
ip: 59,
57+
line: 25,
58+
},
59+
{
60+
ip: 65,
61+
line: 26,
62+
},
63+
{
64+
ip: 86,
65+
line: 31,
66+
},
67+
{
68+
ip: 92,
69+
line: 32,
70+
},
71+
],
72+
},
73+
compiler: {
74+
name: 'cashc',
75+
version: '0.11.0-next.0',
76+
},
77+
updatedAt: '2025-01-21T10:30:20.052Z',
78+
} as const;

‎packages/cashscript/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,20 @@
4646
"@bitauth/libauth": "^3.1.0-next.2",
4747
"@cashscript/utils": "^0.11.0-next.0",
4848
"@mr-zwets/bchn-api-wrapper": "^1.0.1",
49-
"delay": "^5.0.0",
49+
"delay": "^6.0.0",
5050
"electrum-cash": "^2.0.10",
5151
"fast-deep-equal": "^3.1.3",
5252
"pako": "^2.1.0",
5353
"semver": "^7.6.3"
5454
},
5555
"devDependencies": {
56-
"@jest/globals": "^29.4.1",
56+
"@jest/globals": "^29.7.0",
5757
"@psf/bch-js": "^6.8.0",
5858
"@types/pako": "^2.0.3",
5959
"@types/semver": "^7.5.8",
6060
"eslint": "^8.54.0",
61-
"jest": "^29.4.1",
62-
"typescript": "^5.5.4"
61+
"jest": "^29.7.0",
62+
"typescript": "^5.7.3"
6363
},
6464
"gitHead": "bf02a4b641d5d03c035d052247a545109c17b708"
6565
}

‎packages/utils/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
"@bitauth/libauth": "^3.1.0-next.2"
4444
},
4545
"devDependencies": {
46-
"@jest/globals": "^29.4.1",
46+
"@jest/globals": "^29.7.0",
4747
"eslint": "^8.54.0",
48-
"jest": "^29.4.1",
49-
"typescript": "^5.5.4"
48+
"jest": "^29.7.0",
49+
"typescript": "^5.7.3"
5050
},
5151
"gitHead": "bf02a4b641d5d03c035d052247a545109c17b708"
5252
}

0 commit comments

Comments
 (0)