Skip to content

Commit

Permalink
Fix build issues
Browse files Browse the repository at this point in the history
  • Loading branch information
bitjson committed Dec 13, 2024
1 parent febc970 commit 3075c46
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .pnp.cjs

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

2 changes: 1 addition & 1 deletion .yarn
2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ supportedArchitectures:
- linux
- win32

yarnPath: .yarn/releases/yarn-4.5.0.cjs
yarnPath: .yarn/releases/yarn-4.5.3.cjs
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"gen:graph": "mkdir -p temp && madge --image temp/deps-$(date +\"%FT%H%M\").svg build/index.js",
"test": "yarn build && yarn test:policies && yarn test:unit",
"test:policies": "yarn test:deps && yarn test:schemas && yarn test:lint && yarn test:cycles",
"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)));\"",
"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)));\"",
"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) )\"",
"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.\"",
"test:lint": "yarn test:prettier && yarn test:eslint && yarn test:spelling",
Expand Down Expand Up @@ -204,7 +204,7 @@
]
},
"sideEffects": false,
"packageManager": "yarn@4.5.0",
"packageManager": "yarn@4.5.3",
"resolutions": {
"eslint-config-bitauth": "portal:./config/eslint-config-bitauth"
}
Expand Down
4 changes: 2 additions & 2 deletions src/lib/schema/ajv/validate-wallet-template.js
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ const schema22 = {
properties: {
lockingType: {
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.',
'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`',
enum: ['p2sh20', 'p2sh32', 'standard'],
type: 'string',
},
Expand Down Expand Up @@ -810,7 +810,7 @@ const schema38 = {
properties: {
lockingType: {
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.',
'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`',
enum: ['p2sh20', 'p2sh32', 'standard'],
type: 'string',
},
Expand Down
2 changes: 1 addition & 1 deletion src/lib/schema/wallet-template.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@
"additionalProperties": false,
"properties": {
"lockingType": {
"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.",
"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`",
"enum": ["p2sh20", "p2sh32", "standard"],
"type": "string"
},
Expand Down
4 changes: 4 additions & 0 deletions src/lib/vmb-tests/bchn/bchn-error-map.spec.helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ export const libauthErrorPrefixToBchnErrorStandard: {
excessiveLooping: '',
excessiveOperationCost:
'mandatory-script-verify-flag-failed (VM cost limit exceeded)',
excessiveOperationCostOpPow:
'mandatory-script-verify-flag-failed (VM cost limit exceeded)',
failedVerify:
'mandatory-script-verify-flag-failed (Script failed an OP_EQUALVERIFY operation)',
incompatibleLocktimeType: '',
Expand Down Expand Up @@ -159,6 +161,8 @@ export const libauthErrorPrefixToBchnErrorNonstandard: {
excessiveLooping: '',
excessiveOperationCost:
'mandatory-script-verify-flag-failed (VM cost limit exceeded)',
excessiveOperationCostOpPow:
'mandatory-script-verify-flag-failed (VM cost limit exceeded)',
failedVerify:
'mandatory-script-verify-flag-failed (Script failed an OP_EQUALVERIFY operation)',
incompatibleLocktimeType: '',
Expand Down
2 changes: 1 addition & 1 deletion wasm/bitcoin-cash-node
Submodule bitcoin-cash-node updated from 01beca to 4b729c

0 comments on commit 3075c46

Please sign in to comment.