From e292f9e0d59cc817aece0db286aceb4860d304cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Bordalo?= Date: Fri, 2 Feb 2024 14:05:18 +0000 Subject: [PATCH] Update deps && Replace OP_NOP2 with OP_CHECKLOCKTIMEVERIFY (#524) * fix opcode name returned from toASM * bump ionio * reverse ionio bump * update yarn.lock * reverse yarn.lock * bump ionio to 0.5.3 --- package.json | 4 ++-- src/pkg/boltz.ts | 4 ++-- test/boltz.spec.ts | 2 +- yarn.lock | 18 +++++++++--------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 61d2ee8b..9510abc0 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "web-ext:lint": "web-ext lint --source-dir dist" }, "dependencies": { - "@ionio-lang/ionio": "^0.5.2", + "@ionio-lang/ionio": "^0.5.3", "@metamask/safe-event-emitter": "^2.0.0", "@sentry/browser": "^7.13.0", "@tailwindcss/postcss7-compat": "^2.1.2", @@ -38,7 +38,7 @@ "formik": "^2.2.9", "google-protobuf": "^3.15.8", "isomorphic-ws": "^5.0.0", - "liquidjs-lib": "^6.0.2-liquid.32", + "liquidjs-lib": "^6.0.2-liquid.34", "lodash.debounce": "^4.0.8", "lottie-web": "^5.7.8", "marina-provider": "^3.0.1", diff --git a/src/pkg/boltz.ts b/src/pkg/boltz.ts index f71f5ffa..0a98d6f8 100644 --- a/src/pkg/boltz.ts +++ b/src/pkg/boltz.ts @@ -558,7 +558,7 @@ export class Boltz implements BoltzInterface { 'OP_ELSE', 'OP_DROP', cltv, - 'OP_NOP2', + 'OP_CHECKLOCKTIMEVERIFY', 'OP_DROP', refundPubKey, 'OP_ENDIF', @@ -583,7 +583,7 @@ export class Boltz implements BoltzInterface { boltzPubkey, 'OP_ELSE', cltv, - 'OP_NOP2', // OP_CHECKLOCKTIMEVERIFY + 'OP_CHECKLOCKTIMEVERIFY', 'OP_DROP', refundPublicKey, 'OP_ENDIF', diff --git a/test/boltz.spec.ts b/test/boltz.spec.ts index 6f91e07a..3929c89b 100644 --- a/test/boltz.spec.ts +++ b/test/boltz.spec.ts @@ -73,7 +73,7 @@ const getAddressForSwapScript = ( boltzPubkey, 'OP_ELSE', timelock, - 'OP_NOP2', + 'OP_CHECKLOCKTIMEVERIFY', 'OP_DROP', refundPubKey, 'OP_ENDIF', diff --git a/yarn.lock b/yarn.lock index 3818c6d5..d80d096d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -428,12 +428,12 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== -"@ionio-lang/ionio@^0.5.2": - version "0.5.2" - resolved "https://registry.yarnpkg.com/@ionio-lang/ionio/-/ionio-0.5.2.tgz#4384e319f6f28b4c7cb40d94e268ba3dbd60de28" - integrity sha512-6P9H9FMPlmlN/DujwC8eeU6D0OHYW73GaHlucyHWIazSufifKF+mcQzV3hMNsaxAi7UQOkQ5UMCRKuOZpeK//A== +"@ionio-lang/ionio@^0.5.3": + version "0.5.3" + resolved "https://registry.yarnpkg.com/@ionio-lang/ionio/-/ionio-0.5.3.tgz#847c967df0f231bc48e2cc8c22455032fdb8c5b8" + integrity sha512-VOizIv8/ugBeoMI3K03qdzc6Fm9L9klEyuwD12qEurLjXLDsF/HR3+BG7R4lgfLPEtHfFsrahEyN7KmoNSXGLQ== dependencies: - liquidjs-lib "^6.0.2-liquid.32" + liquidjs-lib "^6.0.2-liquid.34" "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" @@ -5556,10 +5556,10 @@ lines-and-columns@^2.0.2: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-2.0.3.tgz#b2f0badedb556b747020ab8ea7f0373e22efac1b" integrity sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w== -liquidjs-lib@^6.0.2-liquid.32: - version "6.0.2-liquid.32" - resolved "https://registry.yarnpkg.com/liquidjs-lib/-/liquidjs-lib-6.0.2-liquid.32.tgz#23f13a23eb49dcda7708bb1542b75db97acc8adc" - integrity sha512-EHKulPNptqGyPZKbWCygdvRP6FIjHLoLRJ0YTAp58Ikm9/t9UjFgeWEwrAwORwKyc4BnWTVwJqNZEBBzjX+cAA== +liquidjs-lib@^6.0.2-liquid.34: + version "6.0.2-liquid.34" + resolved "https://registry.yarnpkg.com/liquidjs-lib/-/liquidjs-lib-6.0.2-liquid.34.tgz#f48817e2036ed4e2d3ed322995b0487f5794ab87" + integrity sha512-oGW7ianIcrSlK4HdKlhpShx5H4jRxzS/KZahozOb0Vfkz/3PrAXa6fIwuAxfnhOzchVKwqlXerCZvIBXzDQA5g== dependencies: "@types/randombytes" "^2.0.0" bech32 "^2.0.0"