From 6d48179265c634bbfb87aad88353c48928fa2ef1 Mon Sep 17 00:00:00 2001 From: Alan Marko Date: Thu, 7 Mar 2024 13:35:42 +0000 Subject: [PATCH 1/2] fix(cargo): update toml+lock files to use new patch of boa --- Cargo.lock | 14 +++++++------- Cargo.toml | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ef6d70a60..2f6f29047 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -528,7 +528,7 @@ dependencies = [ [[package]] name = "boa_ast" version = "0.17.0" -source = "git+https://github.com/trilitech/boa.git?branch=sam.finch@/context/expose-instruction-count#41b24d59549faaec36d076a18546c9c323e93b5e" +source = "git+https://github.com/trilitech/boa.git?branch=ryutamago/fix-undefined-to-json#78c8540eb0167abd62975f47d40aa55a7bbcf5d0" dependencies = [ "arbitrary", "bitflags 2.4.1", @@ -542,7 +542,7 @@ dependencies = [ [[package]] name = "boa_engine" version = "0.17.0" -source = "git+https://github.com/trilitech/boa.git?branch=sam.finch@/context/expose-instruction-count#41b24d59549faaec36d076a18546c9c323e93b5e" +source = "git+https://github.com/trilitech/boa.git?branch=ryutamago/fix-undefined-to-json#78c8540eb0167abd62975f47d40aa55a7bbcf5d0" dependencies = [ "bitflags 2.4.1", "boa_ast", @@ -580,7 +580,7 @@ dependencies = [ [[package]] name = "boa_gc" version = "0.17.0" -source = "git+https://github.com/trilitech/boa.git?branch=sam.finch@/context/expose-instruction-count#41b24d59549faaec36d076a18546c9c323e93b5e" +source = "git+https://github.com/trilitech/boa.git?branch=ryutamago/fix-undefined-to-json#78c8540eb0167abd62975f47d40aa55a7bbcf5d0" dependencies = [ "boa_macros", "boa_profiler", @@ -591,7 +591,7 @@ dependencies = [ [[package]] name = "boa_interner" version = "0.17.0" -source = "git+https://github.com/trilitech/boa.git?branch=sam.finch@/context/expose-instruction-count#41b24d59549faaec36d076a18546c9c323e93b5e" +source = "git+https://github.com/trilitech/boa.git?branch=ryutamago/fix-undefined-to-json#78c8540eb0167abd62975f47d40aa55a7bbcf5d0" dependencies = [ "arbitrary", "boa_gc", @@ -607,7 +607,7 @@ dependencies = [ [[package]] name = "boa_macros" version = "0.17.0" -source = "git+https://github.com/trilitech/boa.git?branch=sam.finch@/context/expose-instruction-count#41b24d59549faaec36d076a18546c9c323e93b5e" +source = "git+https://github.com/trilitech/boa.git?branch=ryutamago/fix-undefined-to-json#78c8540eb0167abd62975f47d40aa55a7bbcf5d0" dependencies = [ "proc-macro2", "quote", @@ -618,7 +618,7 @@ dependencies = [ [[package]] name = "boa_parser" version = "0.17.0" -source = "git+https://github.com/trilitech/boa.git?branch=sam.finch@/context/expose-instruction-count#41b24d59549faaec36d076a18546c9c323e93b5e" +source = "git+https://github.com/trilitech/boa.git?branch=ryutamago/fix-undefined-to-json#78c8540eb0167abd62975f47d40aa55a7bbcf5d0" dependencies = [ "bitflags 2.4.1", "boa_ast", @@ -636,7 +636,7 @@ dependencies = [ [[package]] name = "boa_profiler" version = "0.17.0" -source = "git+https://github.com/trilitech/boa.git?branch=sam.finch@/context/expose-instruction-count#41b24d59549faaec36d076a18546c9c323e93b5e" +source = "git+https://github.com/trilitech/boa.git?branch=ryutamago/fix-undefined-to-json#78c8540eb0167abd62975f47d40aa55a7bbcf5d0" [[package]] name = "brotli" diff --git a/Cargo.toml b/Cargo.toml index 5615f2ae8..395d97e1f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -84,10 +84,10 @@ tezos-smart-rollup-entrypoint = { git = "https://gitlab.com/tezos/tezos.git" } tezos-smart-rollup-debug = { git = "https://gitlab.com/tezos/tezos.git" } tezos-smart-rollup-panic-hook = { git = "https://gitlab.com/tezos/tezos.git" } tezos-smart-rollup-storage = { git = "https://gitlab.com/tezos/tezos.git" } -boa_ast = { git = "https://github.com/trilitech/boa.git", branch = "sam.finch@/context/expose-instruction-count" } -boa_engine = { git = "https://github.com/trilitech/boa.git", branch = "sam.finch@/context/expose-instruction-count" } -boa_gc = { git = "https://github.com/trilitech/boa.git", branch = "sam.finch@/context/expose-instruction-count" } -boa_interner = { git = "https://github.com/trilitech/boa.git", branch = "sam.finch@/context/expose-instruction-count" } -boa_macros = { git = "https://github.com/trilitech/boa.git", branch = "sam.finch@/context/expose-instruction-count" } -boa_parser = { git = "https://github.com/trilitech/boa.git", branch = "sam.finch@/context/expose-instruction-count" } -boa_profiler = { git = "https://github.com/trilitech/boa.git", branch = "sam.finch@/context/expose-instruction-count" } +boa_ast = { git = "https://github.com/trilitech/boa.git", branch = "ryutamago/fix-undefined-to-json" } +boa_engine = { git = "https://github.com/trilitech/boa.git", branch = "ryutamago/fix-undefined-to-json" } +boa_gc = { git = "https://github.com/trilitech/boa.git", branch = "ryutamago/fix-undefined-to-json" } +boa_interner = { git = "https://github.com/trilitech/boa.git", branch = "ryutamago/fix-undefined-to-json" } +boa_macros = { git = "https://github.com/trilitech/boa.git", branch = "ryutamago/fix-undefined-to-json" } +boa_parser = { git = "https://github.com/trilitech/boa.git", branch = "ryutamago/fix-undefined-to-json" } +boa_profiler = { git = "https://github.com/trilitech/boa.git", branch = "ryutamago/fix-undefined-to-json" } From 246920b20a4e56273a3a6f6a54e3dd7791ac19f7 Mon Sep 17 00:00:00 2001 From: Alan Marko Date: Thu, 7 Mar 2024 13:51:25 +0000 Subject: [PATCH 2/2] fix(nix): updated jstz.nix with new hash --- nix/jstz.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/jstz.nix b/nix/jstz.nix index 799d53379..2d10babb4 100644 --- a/nix/jstz.nix +++ b/nix/jstz.nix @@ -43,7 +43,7 @@ lockFile = ../Cargo.lock; outputHashes = { "tezos-smart-rollup-0.2.2" = "sha256-v0ayPeHzhGzCdaHLpYh0bQm1569KrHgR/IxCXwBwhQU="; - "boa_engine-0.17.0" = "sha256-RNFuFvBwDA/tjhEonFnn3t1q5DDehQkqLteJpWIXTFU="; + "boa_engine-0.17.0" = "sha256-xMLwVEORTJgoSBxi3znF8AIOOZ8RF6aX0OXMdjEs2K0="; "boa_gc-0.17.0" = "sha256-bf6i5ESIHwepb1a4dUYREPprz7Rijq+P5z+NXpsT16Q="; "hermit-0.7.2" = "sha256-GJLujJml6IpT1+rbOG0BdDVkoI1PQGc3McryTggPu+o="; };