Skip to content

Commit 3075c46

Browse files
committed
Fix build issues
1 parent febc970 commit 3075c46

8 files changed

+13
-9
lines changed

.pnp.cjs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.yarnrc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ supportedArchitectures:
1818
- linux
1919
- win32
2020

21-
yarnPath: .yarn/releases/yarn-4.5.0.cjs
21+
yarnPath: .yarn/releases/yarn-4.5.3.cjs

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"gen:graph": "mkdir -p temp && madge --image temp/deps-$(date +\"%FT%H%M\").svg build/index.js",
6464
"test": "yarn build && yarn test:policies && yarn test:unit",
6565
"test:policies": "yarn test:deps && yarn test:schemas && yarn test:lint && yarn test:cycles",
66-
"test:deps": "node -e \"import('./package.json', { assert: { type: 'json' } }).then(p => typeof p.dependencies === 'undefined' ? console.log('No dependencies found.') : (console.error('Dependencies are not allowed.') && process.exit(1)));\"",
66+
"test:deps": "node -e \"import('./package.json', { with: { type: 'json' } }).then(p => typeof p.dependencies === 'undefined' ? console.log('No dependencies found.') : (console.error('Dependencies are not allowed.') && process.exit(1)));\"",
6767
"test:schemas:unchanged": "yarn gen:schema && node -e \"child_process.exec('git status src/lib/schema --porcelain | head -c1 | wc -c', (err, stdout) => stdout.trim() === '0' ? process.exit(0) : process.exit(1) )\"",
6868
"test:schemas": "yarn test:schemas:unchanged && echo \"Schemas are up to date.\" || echo \"Error: one or more schemas are outdated. Please review and commit the changes in src/lib/schema.\"",
6969
"test:lint": "yarn test:prettier && yarn test:eslint && yarn test:spelling",
@@ -204,7 +204,7 @@
204204
]
205205
},
206206
"sideEffects": false,
207-
"packageManager": "[email protected].0",
207+
"packageManager": "[email protected].3",
208208
"resolutions": {
209209
"eslint-config-bitauth": "portal:./config/eslint-config-bitauth"
210210
}

src/lib/schema/ajv/validate-wallet-template.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ const schema22 = {
556556
properties: {
557557
lockingType: {
558558
description:
559-
'Indicates if P2SH20 infrastructure should be used when producing bytecode related to this script. For more information on P2SH20, see BIP16.\n\nWhen compiling locking scripts of type `p2sh20`, the result will be placed in a P2SH20 "redeem script" format: `OP_HASH160 <$(<lockingBytecode> OP_HASH160)> OP_EQUAL`\n\nWhen compiling unlocking scripts that unlock locking scripts of type `p2sh20`, the result will be transformed into the P2SH20 unlocking format: `unlockingBytecode <lockingBytecode>` (where `lockingBytecode` is the compiled bytecode of the locking script, without the "redeem script" transformation.)\n\nThe presence of the `lockingType` property indicates that this script is a locking script. It must be present on any script referenced by the `unlocks` property of another script.',
559+
'Indicates if P2SH20 infrastructure should be used when producing bytecode related to this script. For more information on P2SH20, see BIP16.\n\nWhen compiling locking scripts of type `p2sh20`, the result will be placed in a P2SH20 "redeem script" format: `OP_HASH160 <$(<lockingBytecode> OP_HASH160)> OP_EQUAL`\n\nWhen compiling unlocking scripts that unlock locking scripts of type `p2sh20`, the result will be transformed into the P2SH20 unlocking format: `unlockingBytecode <lockingBytecode>` (where `lockingBytecode` is the compiled bytecode of the locking script, without the "redeem script" transformation.)\n\nThe presence of the `lockingType` property indicates that this script is a locking script. It must be present on any script referenced by the `unlocks` property of another script.\n\nTODO: migrate `standard` -> `p2s`',
560560
enum: ['p2sh20', 'p2sh32', 'standard'],
561561
type: 'string',
562562
},
@@ -810,7 +810,7 @@ const schema38 = {
810810
properties: {
811811
lockingType: {
812812
description:
813-
'Indicates if P2SH20 infrastructure should be used when producing bytecode related to this script. For more information on P2SH20, see BIP16.\n\nWhen compiling locking scripts of type `p2sh20`, the result will be placed in a P2SH20 "redeem script" format: `OP_HASH160 <$(<lockingBytecode> OP_HASH160)> OP_EQUAL`\n\nWhen compiling unlocking scripts that unlock locking scripts of type `p2sh20`, the result will be transformed into the P2SH20 unlocking format: `unlockingBytecode <lockingBytecode>` (where `lockingBytecode` is the compiled bytecode of the locking script, without the "redeem script" transformation.)\n\nThe presence of the `lockingType` property indicates that this script is a locking script. It must be present on any script referenced by the `unlocks` property of another script.',
813+
'Indicates if P2SH20 infrastructure should be used when producing bytecode related to this script. For more information on P2SH20, see BIP16.\n\nWhen compiling locking scripts of type `p2sh20`, the result will be placed in a P2SH20 "redeem script" format: `OP_HASH160 <$(<lockingBytecode> OP_HASH160)> OP_EQUAL`\n\nWhen compiling unlocking scripts that unlock locking scripts of type `p2sh20`, the result will be transformed into the P2SH20 unlocking format: `unlockingBytecode <lockingBytecode>` (where `lockingBytecode` is the compiled bytecode of the locking script, without the "redeem script" transformation.)\n\nThe presence of the `lockingType` property indicates that this script is a locking script. It must be present on any script referenced by the `unlocks` property of another script.\n\nTODO: migrate `standard` -> `p2s`',
814814
enum: ['p2sh20', 'p2sh32', 'standard'],
815815
type: 'string',
816816
},

src/lib/schema/wallet-template.schema.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@
527527
"additionalProperties": false,
528528
"properties": {
529529
"lockingType": {
530-
"description": "Indicates if P2SH20 infrastructure should be used when producing bytecode related to this script. For more information on P2SH20, see BIP16.\n\nWhen compiling locking scripts of type `p2sh20`, the result will be placed in a P2SH20 \"redeem script\" format: `OP_HASH160 <$(<lockingBytecode> OP_HASH160)> OP_EQUAL`\n\nWhen compiling unlocking scripts that unlock locking scripts of type `p2sh20`, the result will be transformed into the P2SH20 unlocking format: `unlockingBytecode <lockingBytecode>` (where `lockingBytecode` is the compiled bytecode of the locking script, without the \"redeem script\" transformation.)\n\nThe presence of the `lockingType` property indicates that this script is a locking script. It must be present on any script referenced by the `unlocks` property of another script.",
530+
"description": "Indicates if P2SH20 infrastructure should be used when producing bytecode related to this script. For more information on P2SH20, see BIP16.\n\nWhen compiling locking scripts of type `p2sh20`, the result will be placed in a P2SH20 \"redeem script\" format: `OP_HASH160 <$(<lockingBytecode> OP_HASH160)> OP_EQUAL`\n\nWhen compiling unlocking scripts that unlock locking scripts of type `p2sh20`, the result will be transformed into the P2SH20 unlocking format: `unlockingBytecode <lockingBytecode>` (where `lockingBytecode` is the compiled bytecode of the locking script, without the \"redeem script\" transformation.)\n\nThe presence of the `lockingType` property indicates that this script is a locking script. It must be present on any script referenced by the `unlocks` property of another script.\n\nTODO: migrate `standard` -> `p2s`",
531531
"enum": ["p2sh20", "p2sh32", "standard"],
532532
"type": "string"
533533
},

src/lib/vmb-tests/bchn/bchn-error-map.spec.helper.ts

+4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ export const libauthErrorPrefixToBchnErrorStandard: {
3737
excessiveLooping: '',
3838
excessiveOperationCost:
3939
'mandatory-script-verify-flag-failed (VM cost limit exceeded)',
40+
excessiveOperationCostOpPow:
41+
'mandatory-script-verify-flag-failed (VM cost limit exceeded)',
4042
failedVerify:
4143
'mandatory-script-verify-flag-failed (Script failed an OP_EQUALVERIFY operation)',
4244
incompatibleLocktimeType: '',
@@ -159,6 +161,8 @@ export const libauthErrorPrefixToBchnErrorNonstandard: {
159161
excessiveLooping: '',
160162
excessiveOperationCost:
161163
'mandatory-script-verify-flag-failed (VM cost limit exceeded)',
164+
excessiveOperationCostOpPow:
165+
'mandatory-script-verify-flag-failed (VM cost limit exceeded)',
162166
failedVerify:
163167
'mandatory-script-verify-flag-failed (Script failed an OP_EQUALVERIFY operation)',
164168
incompatibleLocktimeType: '',

wasm/bitcoin-cash-node

Submodule bitcoin-cash-node updated from 01beca0 to 4b729ce

0 commit comments

Comments
 (0)