From 18403477b1ae89b9abe0689c8cdeaeda85da4ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20M=C3=BCller?= Date: Tue, 12 Mar 2024 09:51:47 -0700 Subject: [PATCH 1/2] Update to Cadence v1.0.0-preview.12 --- languageserver/go.mod | 26 ++++++++++++---------- languageserver/go.sum | 51 ++++++++++++++++++++++++------------------- 2 files changed, 42 insertions(+), 35 deletions(-) diff --git a/languageserver/go.mod b/languageserver/go.mod index fd141e6e..adac1623 100644 --- a/languageserver/go.mod +++ b/languageserver/go.mod @@ -7,11 +7,11 @@ require ( github.com/google/uuid v1.6.0 github.com/mattn/go-isatty v0.0.20 github.com/mitchellh/mapstructure v1.5.0 - github.com/onflow/cadence v1.0.0-M8 - github.com/onflow/cadence-tools/lint v1.0.0-M5 - github.com/onflow/cadence-tools/test v1.0.0-M6 - github.com/onflow/flow-go-sdk v1.0.0-M5 - github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.5 + github.com/onflow/cadence v1.0.0-preview.12 + github.com/onflow/cadence-tools/lint v1.0.0-preview.8 + github.com/onflow/cadence-tools/test v1.0.0-preview.7 + github.com/onflow/flow-go-sdk v1.0.0-preview.10 + github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.8 github.com/sourcegraph/jsonrpc2 v0.1.0 github.com/spf13/afero v1.10.0 github.com/spf13/pflag v1.0.5 @@ -20,8 +20,8 @@ require ( ) require ( - github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240206003101-928bf99024d7 // indirect - github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240206003101-928bf99024d7 // indirect + github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240305214031-d81e0c3b42f3 // indirect + github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240305214031-d81e0c3b42f3 // indirect ) require ( @@ -135,12 +135,14 @@ require ( github.com/multiformats/go-multistream v0.5.0 // indirect github.com/multiformats/go-varint v0.0.7 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect - github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f // indirect + github.com/onflow/atree v0.6.1-0.20240308163425-dc825c20b1a2 // indirect github.com/onflow/crypto v0.25.0 // indirect - github.com/onflow/flow-emulator v1.0.0-M7 // indirect - github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20240205224107-320aa3cf09e0 // indirect - github.com/onflow/flow-go v0.34.0-crescendo-preview.1.0.20240222213538-3677206d445c // indirect - github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240205233530-86ee8c352fa6 // indirect + github.com/onflow/flow-emulator v1.0.0-preview.10 // indirect + github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20240305212555-29d91e18f0c1 // indirect + github.com/onflow/flow-ft/lib/go/templates v0.7.1-0.20240305212555-29d91e18f0c1 // indirect + github.com/onflow/flow-go v0.34.0-crescendo-preview.5.0.20240312025929-25d0a9f6e292 // indirect + github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240305213046-9026973838d7 // indirect + github.com/onflow/flow-nft/lib/go/templates v0.0.0-20240305213046-9026973838d7 // indirect github.com/onflow/flow/protobuf/go/flow v0.3.7 // indirect github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect diff --git a/languageserver/go.sum b/languageserver/go.sum index 38498246..36658b9c 100644 --- a/languageserver/go.sum +++ b/languageserver/go.sum @@ -1838,37 +1838,42 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= -github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f h1:Z8/PgTqOgOg02MTRpTBYO2k16FE6z4wEOtaC2WBR9Xo= github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f/go.mod h1:xvP61FoOs95K7IYdIYRnNcYQGf4nbF/uuJ0tHf4DRuM= +github.com/onflow/atree v0.6.1-0.20240308163425-dc825c20b1a2 h1:jJLDswfAVB0bHCu1y1FPdKukPcTNmN+jYEX9S9phbv0= +github.com/onflow/atree v0.6.1-0.20240308163425-dc825c20b1a2/go.mod h1:xvP61FoOs95K7IYdIYRnNcYQGf4nbF/uuJ0tHf4DRuM= github.com/onflow/cadence v1.0.0-M3/go.mod h1:odXGZZ/wGNA5mwT8bC9v8u8EXACHllB2ABSZK65TGL8= -github.com/onflow/cadence v1.0.0-M8 h1:ioQ7TyhpsIaImAC7Xn2r8kIgIBdimvyuWeKlGfRxWB8= -github.com/onflow/cadence v1.0.0-M8/go.mod h1:a4mccDU90hmuxCLUFzs9J/ANG/rYbFa36h4Z0bBAqNU= -github.com/onflow/cadence-tools/lint v1.0.0-M5 h1:LE297dzYhKn80QS5EGh0YaqEwuHTP3rmtgNIM3T9v5Y= -github.com/onflow/cadence-tools/lint v1.0.0-M5/go.mod h1:5WMsRbV8h6hymo/+Gu5CY7MEEC781+2t6k/dzvdm7dg= -github.com/onflow/cadence-tools/test v1.0.0-M6 h1:mgdlYuSG42iMdUT6UD5cRAzsY8p9SyZ9mFDEH0spnmA= -github.com/onflow/cadence-tools/test v1.0.0-M6/go.mod h1:cSS8KOb1qWDbudXunv+dHQvwwN3JuMxLqI0GDro+zQw= +github.com/onflow/cadence v1.0.0-preview.12 h1:1/6vY61ueMqORQAb2rqtjyBw1SCuWh4jM6sKZEn/ANk= +github.com/onflow/cadence v1.0.0-preview.12/go.mod h1:no8+e5V51B9mgfi4U9xdeH+GxcJdoKKDP9gdxEj9Jdg= +github.com/onflow/cadence-tools/lint v1.0.0-preview.8 h1:RiVeyIlR1QuRr04NnuVsJTtjyJVQE/K+NLPMDI65dvM= +github.com/onflow/cadence-tools/lint v1.0.0-preview.8/go.mod h1:N14xbms0aavDfQJOpvHiSX3DDcmr3cnKx0xHK9uSOdE= +github.com/onflow/cadence-tools/test v1.0.0-preview.7 h1:tZ3lVnAklxzdINCaKH4iLoPE3Ts9QWZK0R93uXU4nCs= +github.com/onflow/cadence-tools/test v1.0.0-preview.7/go.mod h1:1RucbI7AE+4hAlhoxv4em6C2Nqndz25EW7DPOl77mKE= github.com/onflow/crypto v0.25.0 h1:BeWbLsh3ZD13Ej+Uky6kg1PL1ZIVBDVX+2MVBNwqddg= github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI= -github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240206003101-928bf99024d7 h1:OI/4F2NK/X/4x3dTUFFDGtuOsSa9pX+jjBeSEcBrY/M= -github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240206003101-928bf99024d7/go.mod h1:GK+Ik1K3L3v8xmHmRQv5yxJz81lYhdYSNm0PQ63Xrws= -github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240206003101-928bf99024d7 h1:WAx8ftVz1BeXiKvQ9gLKEf1J3NBWK26Pbczd0iH4C6I= -github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240206003101-928bf99024d7/go.mod h1:MZ2j5YVTQiSE0B99zuaYhxvGG5GcvimWpQK1Fw/1QBg= -github.com/onflow/flow-emulator v1.0.0-M7 h1:8moFcl+KNAU1YOnEJim+x1pUGA5IRdfcBPgDbZkAels= -github.com/onflow/flow-emulator v1.0.0-M7/go.mod h1:S611ccJDDFLC99+VIAL8slsJx5Y9rxljFCY1aS67okU= -github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20240205224107-320aa3cf09e0 h1:u6/YcUvO8jU0f3Evb/6agzXqeOo+VbL2a3mmj/5ifRs= -github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20240205224107-320aa3cf09e0/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A= -github.com/onflow/flow-go v0.34.0-crescendo-preview.1.0.20240222213538-3677206d445c h1:G3xZCm3FnckxGVTcgxUUTzrreYy3LxjsQl3PApbO1bc= -github.com/onflow/flow-go v0.34.0-crescendo-preview.1.0.20240222213538-3677206d445c/go.mod h1:bvwbHFWiPGkASyJ+ZdSp7mZAOCqpSlCtza9JeKSmfEE= +github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240305214031-d81e0c3b42f3 h1:UNLms46HthnzKTR3DVQmEoDerf4EtNUMfkombIeT3U8= +github.com/onflow/flow-core-contracts/lib/go/contracts v0.15.2-0.20240305214031-d81e0c3b42f3/go.mod h1:ROB3X1QhobsVj3ZqSn8fy8gX2pXL8tHNUC+jZUCWpnA= +github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240305214031-d81e0c3b42f3 h1:svq9+OKnCdIm6ePR6i/laXtg5kP7XHGsHUpsYevPIJ4= +github.com/onflow/flow-core-contracts/lib/go/templates v0.15.2-0.20240305214031-d81e0c3b42f3/go.mod h1:Ka6dexQbB/5R64cpfA9KZQ7V0pqqHNS5T3G3wftaQVw= +github.com/onflow/flow-emulator v1.0.0-preview.10 h1:NqQM9kUCgpkkLglR3QTcdbAIpHseJbOkk5URMpm/qK0= +github.com/onflow/flow-emulator v1.0.0-preview.10/go.mod h1:32VSbDq7SDOxyFjXr7XrYO0sjToiVCX55IbhAwvmdGs= +github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20240305212555-29d91e18f0c1 h1:1hTH+Y8EB8BZ0hXsrxZqSTDWoY0euFT/IzXxlgVQok4= +github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20240305212555-29d91e18f0c1/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A= +github.com/onflow/flow-ft/lib/go/templates v0.7.1-0.20240305212555-29d91e18f0c1 h1:7BkqJ21EQAbYCZqLj2xCIqJvhrHNCXe9BfLTEiQqIx0= +github.com/onflow/flow-ft/lib/go/templates v0.7.1-0.20240305212555-29d91e18f0c1/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE= +github.com/onflow/flow-go v0.34.0-crescendo-preview.5.0.20240312025929-25d0a9f6e292 h1:C/K1NUVPLSXfVNzy7HjcjBIt3ir0X0AjDo+VMpNl3Go= +github.com/onflow/flow-go v0.34.0-crescendo-preview.5.0.20240312025929-25d0a9f6e292/go.mod h1:PPaV69Oq5jzPCw/HK7HcLKh5zX/RdAlh5B08I0QgbM4= github.com/onflow/flow-go-sdk v1.0.0-M1/go.mod h1:TDW0MNuCs4SvqYRUzkbRnRmHQL1h4X8wURsCw9P9beo= -github.com/onflow/flow-go-sdk v1.0.0-M5 h1:R86DQQfXS3z8O6AShAaUNbkPOM7lOwcTk06cofdVEsk= -github.com/onflow/flow-go-sdk v1.0.0-M5/go.mod h1:aXSavLzoRlz5FiMjcI7p5QhihWScGctxydzf4dv/avo= -github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240205233530-86ee8c352fa6 h1:/2vvjKkWG/3cKP3IpgiGNqXi0yskn4GmNTjmeCwMoz8= -github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240205233530-86ee8c352fa6/go.mod h1:2gpbza+uzs1k7x31hkpBPlggIRkI53Suo0n2AyA2HcE= +github.com/onflow/flow-go-sdk v1.0.0-preview.10 h1:7AolYdUBQLCddIfVhD5DoFYUQ+F1xDG8gtzeinqBWcc= +github.com/onflow/flow-go-sdk v1.0.0-preview.10/go.mod h1:jYAxpaRkLWleW61N5hsvyo8RaLo8WNVvHYg+QtcN1+A= +github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240305213046-9026973838d7 h1:0/s3DzQp3JHWuuz3DpGwniFShtgEy3wq1uBB+4uOG1I= +github.com/onflow/flow-nft/lib/go/contracts v1.1.1-0.20240305213046-9026973838d7/go.mod h1:2gpbza+uzs1k7x31hkpBPlggIRkI53Suo0n2AyA2HcE= +github.com/onflow/flow-nft/lib/go/templates v0.0.0-20240305213046-9026973838d7 h1:VU294Tk/Ra/UuuJbArLILA+x+4qX5qGPTY/kokNKyA4= +github.com/onflow/flow-nft/lib/go/templates v0.0.0-20240305213046-9026973838d7/go.mod h1:p+2hRvtjLUR3MW1NsoJe5Gqgr2eeH49QB6+s6ze00w0= github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231121210617-52ee94b830c2/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk= github.com/onflow/flow/protobuf/go/flow v0.3.7 h1:+6sBdlE/u4ZMTVB9U1lA6Xn2Bd48lOOX96Bv9dNubsk= github.com/onflow/flow/protobuf/go/flow v0.3.7/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk= -github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.5 h1:A7M6BgzS1aed4BIb2UpZcTIZOdfk+wo2/2Qzl+X6/Yc= -github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.5/go.mod h1:dE+sqHi14wUBiJyeujA2LYVsJDTcXLzSRwiDdJJHji4= +github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.8 h1:n3ppGFu0D+skzOBk/i5WD+qQ2k7nBXZVZn8Yrb0ckkA= +github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.8/go.mod h1:hQiqAWGrI06iwi1MbKdnDrlGdHEcroI3GC+CUFhgu8U= github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba h1:rIehuhO6bj4FkwE4VzwEjX7MoAlOhUJENBJLqDqVxAo= github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU= github.com/onflow/wal v0.0.0-20240208022732-d756cd497d3b h1:6O/BEmA99PDT5QVjoJgrYlGsWnpxGJTAMmsC+V9gyds= From f6cdb7e8667dd30905527ea2f7ad0aff3dc4cb5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20M=C3=BCller?= Date: Tue, 12 Mar 2024 10:26:17 -0700 Subject: [PATCH 2/2] adjust addresses --- languageserver/test/index.test.ts | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/languageserver/test/index.test.ts b/languageserver/test/index.test.ts index 848da52d..b73f5c32 100644 --- a/languageserver/test/index.test.ts +++ b/languageserver/test/index.test.ts @@ -465,8 +465,24 @@ describe("accounts", () => { await withConnection(async (connection) => { let result = await getAccounts(connection) - expect(result.map(r => r.Name).sort()).toEqual(["Alice", "Bob", "Charlie", "Dave", "Eve", "emulator-account [flow.json]", "moose [flow.json]"]) - expect(result.map(r => r.Address)).toEqual(["01cf0e2f2f715450", "179b6b1cb6755e31", "f3fcd2c1a78f5eee", "e03daebed8ca0615", "045a1763c93006ca", "f8d6e0586b0a20c7", "f8d6e0586b0a20c7"]) + expect(result.map(r => r.Name).sort()).toEqual([ + "Alice", + "Bob", + "Charlie", + "Dave", + "Eve", + "emulator-account [flow.json]", + "moose [flow.json]" + ]) + expect(result.map(r => r.Address)).toEqual([ + "179b6b1cb6755e31", + "f3fcd2c1a78f5eee", + "e03daebed8ca0615", + "045a1763c93006ca", + "120e725050340cab", + "f8d6e0586b0a20c7", + "f8d6e0586b0a20c7" + ]) expect(result.map(r => r.Active)).toEqual([true, false, false, false, false, false, false]) }, true) })