Merge pull request #1720 from onflow/auto-update-onflow-cadence-v1.0.…

…0-preview.51

Update to Cadence v1.0.0-preview.51

go.mod

@@ -15,19 +15,19 @@ require (
 	github.com/gosuri/uilive v0.0.4
 	github.com/logrusorgru/aurora/v4 v4.0.0
 	github.com/manifoldco/promptui v0.9.0
-	github.com/onflow/cadence v1.0.0-preview.50
-	github.com/onflow/cadence-tools/languageserver v1.0.0-preview.38
-	github.com/onflow/cadence-tools/lint v1.0.0-preview.38
-	github.com/onflow/cadence-tools/test v1.0.0-preview.38
+	github.com/onflow/cadence v1.0.0-preview.51
+	github.com/onflow/cadence-tools/languageserver v1.0.0-preview.39
+	github.com/onflow/cadence-tools/lint v1.0.0-preview.39
+	github.com/onflow/cadence-tools/test v1.0.0-preview.39
 	github.com/onflow/contract-updater/lib/go/templates v1.0.1
 	github.com/onflow/fcl-dev-wallet v0.8.0-stable-cadence.1
-	github.com/onflow/flixkit-go v1.2.1-cadence-v1-preview.24
+	github.com/onflow/flixkit-go v1.2.1-cadence-v1-preview.25
 	github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1
-	github.com/onflow/flow-emulator v1.0.0-preview.41
-	github.com/onflow/flow-evm-gateway v0.30.3
-	github.com/onflow/flow-go v0.37.7-0.20240826193109-e211841b59f5
-	github.com/onflow/flow-go-sdk v1.0.0-preview.53
-	github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.32
+	github.com/onflow/flow-emulator v1.0.0-preview.42
+	github.com/onflow/flow-evm-gateway v0.31.2-0.20240830233429-10a23322c909
+	github.com/onflow/flow-go v0.37.7-0.20240830182756-9ac9e1889c34
+	github.com/onflow/flow-go-sdk v1.0.0-preview.54
+	github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.33
 	github.com/onflow/go-ethereum v1.14.7
 	github.com/onflowser/flowser/v3 v3.2.1-0.20240131200229-7d4d22715f48
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
@@ -211,7 +211,7 @@ require (
 	github.com/onflow/flow-ft/lib/go/templates v1.0.0 // indirect
 	github.com/onflow/flow-nft/lib/go/contracts v1.2.1 // indirect
 	github.com/onflow/flow-nft/lib/go/templates v1.2.0 // indirect
-	github.com/onflow/flow/protobuf/go/flow v0.4.5 // indirect
+	github.com/onflow/flow/protobuf/go/flow v0.4.6 // indirect
 	github.com/onflow/nft-storefront/lib/go/contracts v1.0.0 // indirect
 	github.com/onflow/sdks v0.6.0-preview.1 // indirect
 	github.com/onflow/wal v1.0.2 // indirect

go.sum

@@ -2157,49 +2157,49 @@ github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f/go.mod h1:xvP61FoOs
 github.com/onflow/atree v0.8.0-rc.6 h1:GWgaylK24b5ta2Hq+TvyOF7X5tZLiLzMMn7lEt59fsA=
 github.com/onflow/atree v0.8.0-rc.6/go.mod h1:yccR+LR7xc1Jdic0mrjocbHvUD7lnVvg8/Ct1AA5zBo=
 github.com/onflow/cadence v1.0.0-M3/go.mod h1:odXGZZ/wGNA5mwT8bC9v8u8EXACHllB2ABSZK65TGL8=
-github.com/onflow/cadence v1.0.0-preview.50 h1:sEfUOG7BXzEqPzB68yZZrG/lkBmHf/o0poYDCY18x3A=
-github.com/onflow/cadence v1.0.0-preview.50/go.mod h1:7wvvecnAZtYOspLOS3Lh+FuAmMeSrXhAWiycC3kQ1UU=
-github.com/onflow/cadence-tools/languageserver v1.0.0-preview.38 h1:/MwSnfAzWZiIyV6CEo8jLnKQRW1vw2hFk0RgO1b1Rh8=
-github.com/onflow/cadence-tools/languageserver v1.0.0-preview.38/go.mod h1:7t7xGMwja5MwiDxYqXUGBzgfmMN3irSespuiYYNFKyM=
-github.com/onflow/cadence-tools/lint v1.0.0-preview.38 h1:ZIYrFkWh2z/iI54W+R9QmdfSN8WG/7tHeBvMx7gOb+0=
-github.com/onflow/cadence-tools/lint v1.0.0-preview.38/go.mod h1:7kEvUs7yVy6y/HPH/8JSfh0w4+peOwPd/a1U7as3l2M=
-github.com/onflow/cadence-tools/test v1.0.0-preview.38 h1:k2QREJ14Seq+Ye7h9V5vqLiZzVMeVuzKP21oMpUyMWw=
-github.com/onflow/cadence-tools/test v1.0.0-preview.38/go.mod h1:90FLNQlrvdIdgiIbYrLr+OYNNcmW3bFmtlKWCXmlbQk=
+github.com/onflow/cadence v1.0.0-preview.51 h1:L+toCS2Sw9bsExc2PxeNMmAK96fn2LdTOD9bl5K/etA=
+github.com/onflow/cadence v1.0.0-preview.51/go.mod h1:7wvvecnAZtYOspLOS3Lh+FuAmMeSrXhAWiycC3kQ1UU=
+github.com/onflow/cadence-tools/languageserver v1.0.0-preview.39 h1:rVuWZ8iwMJSWOhOTzLV1Tgpor2I/gNKT9s7pbvB5too=
+github.com/onflow/cadence-tools/languageserver v1.0.0-preview.39/go.mod h1:Hlee1Rgl+hbFsljfcLJByUmEFVpJSgt70uRQe+j+OIs=
+github.com/onflow/cadence-tools/lint v1.0.0-preview.39 h1:gGRZQrsrXM1PMgmC/ztIdiJR4pRsnF8epCOcKm1UmQY=
+github.com/onflow/cadence-tools/lint v1.0.0-preview.39/go.mod h1:FSqfHNBqoImXs08q1HZbdF3viWaetJcI+i/5Gta4T7g=
+github.com/onflow/cadence-tools/test v1.0.0-preview.39 h1:P1IWj1qk4Jf4Qfa4aHjzFwizUDwjsNIqCrkL/AkZxjg=
+github.com/onflow/cadence-tools/test v1.0.0-preview.39/go.mod h1:80FKugYHr/xo98e1y/6fKGyPOJI0RbyIblupQysz0v8=
 github.com/onflow/contract-updater/lib/go/templates v1.0.1 h1:xPj898Y8OgLLbXH8+JeKVBV6J+nqPZjiLgGM3Abucto=
 github.com/onflow/contract-updater/lib/go/templates v1.0.1/go.mod h1:OXO6s0X7OW4Q6QTfAfnjoOmibEPgs0psOfMi+tPyzQE=
 github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
 github.com/onflow/crypto v0.25.2 h1:GjHunqVt+vPcdqhxxhAXiMIF3YiLX7gTuTR5O+VG2ns=
 github.com/onflow/crypto v0.25.2/go.mod h1:fY7eLqUdMKV8EGOw301unP8h7PvLVy8/6gVR++/g0BY=
 github.com/onflow/fcl-dev-wallet v0.8.0-stable-cadence.1 h1:IqdUzdqFCSW0klWmA3J9c17ZyQTab9SWcWSLouX6o0Q=
 github.com/onflow/fcl-dev-wallet v0.8.0-stable-cadence.1/go.mod h1:kc42jkiuoPJmxMRFjfbRO9XvnR/3XLheaOerxVMDTiw=
-github.com/onflow/flixkit-go v1.2.1-cadence-v1-preview.24 h1:bBITnm4AcSseozYiFDoFHbI5u/mp3xlccfM/YXHwigc=
-github.com/onflow/flixkit-go v1.2.1-cadence-v1-preview.24/go.mod h1:AndgekHFf9qEqoSwPLkXCgK6hd6lJEV4vOogHiKfXAU=
+github.com/onflow/flixkit-go v1.2.1-cadence-v1-preview.25 h1:ytrhcEl67/+Vr+hlKggbZO+Ti9zDOXgTN67C2MhVzTA=
+github.com/onflow/flixkit-go v1.2.1-cadence-v1-preview.25/go.mod h1:jXsXs6uNgGsp8J9DvxXFAYhLe4I13OhlKCfL6sczwEY=
 github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1 h1:q9tXLIALwQ76bO4bmSrhtTkyc2cZF4/gH11ix9E3F5k=
 github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1/go.mod h1:u/mkP/B+PbV33tEG3qfkhhBlydSvAKxfLZSfB4lsJHg=
 github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1 h1:FfhMBAb78p6VAWkJ+iqdKLErGQVQgxk5w6DP5ZruWX8=
 github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1/go.mod h1:NgbMOYnMh0GN48VsNKZuiwK7uyk38Wyo8jN9+C9QE30=
-github.com/onflow/flow-emulator v1.0.0-preview.41 h1:Ep8lb4CD5xG7XC55Ne4ZfKHee58osp3jhmMlUYSjZtw=
-github.com/onflow/flow-emulator v1.0.0-preview.41/go.mod h1:selKgeV9J+VC3mwh2tBbv8h1sEDxCldDeRfj1cUqPg4=
-github.com/onflow/flow-evm-gateway v0.30.3 h1:5qKXOBrHHJhDgA1K09gWapFZqbIzw6HetKi9pFUkbvw=
-github.com/onflow/flow-evm-gateway v0.30.3/go.mod h1:EJVJd/Sp2/vxZR6/dyOK4h9Lgll/fqG7GIXK4doWHvA=
+github.com/onflow/flow-emulator v1.0.0-preview.42 h1:2uMsoKo7wfZOd50GanR7wIoRxpDFErV17wt6/YaeVRo=
+github.com/onflow/flow-emulator v1.0.0-preview.42/go.mod h1:qCT9cAsrtqKHjTmEujihHPH2RfEiL6wNbMqCbmN7HMo=
+github.com/onflow/flow-evm-gateway v0.31.2-0.20240830233429-10a23322c909 h1:Ajpb60/cYIBgtkq8qwjalH9ei3HFRGR4L0CizxFiLos=
+github.com/onflow/flow-evm-gateway v0.31.2-0.20240830233429-10a23322c909/go.mod h1:aBoZwfVnLr/32pLsrP/0hBn3mGeyvO5xw7QxEaL3xts=
 github.com/onflow/flow-ft/lib/go/contracts v1.0.0 h1:mToacZ5NWqtlWwk/7RgIl/jeKB/Sy/tIXdw90yKHcV0=
 github.com/onflow/flow-ft/lib/go/contracts v1.0.0/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
 github.com/onflow/flow-ft/lib/go/templates v1.0.0 h1:6cMS/lUJJ17HjKBfMO/eh0GGvnpElPgBXx7h5aoWJhs=
 github.com/onflow/flow-ft/lib/go/templates v1.0.0/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
-github.com/onflow/flow-go v0.37.7-0.20240826193109-e211841b59f5 h1:rgX5DJC++uXpeVUiUeOY1fvvQlTWuhrstDz+OTluWIw=
-github.com/onflow/flow-go v0.37.7-0.20240826193109-e211841b59f5/go.mod h1:enp027y6GD0GP/PU9x2Ki5E6X+BSLvNN88Ma4RklZDA=
+github.com/onflow/flow-go v0.37.7-0.20240830182756-9ac9e1889c34 h1:5yHX09MtQxNvt2wT5KV1fz+1/iWvBl2IkDr5svGiFN0=
+github.com/onflow/flow-go v0.37.7-0.20240830182756-9ac9e1889c34/go.mod h1:HFx3KzQeT+u3SoCGaD5zXyK7VF7SRI61P0aO2SDjaro=
 github.com/onflow/flow-go-sdk v1.0.0-M1/go.mod h1:TDW0MNuCs4SvqYRUzkbRnRmHQL1h4X8wURsCw9P9beo=
-github.com/onflow/flow-go-sdk v1.0.0-preview.53 h1:hF6X5b9gVQoc/wUa5JTcYU6tw1B7aW71XDdfsFhU5Gw=
-github.com/onflow/flow-go-sdk v1.0.0-preview.53/go.mod h1:FtsoOHw5RNmMMwC7jI1hc99ZVJWhnm/gE3OMvFaZjyg=
+github.com/onflow/flow-go-sdk v1.0.0-preview.54 h1:5GjCkyIyvE9KolOUUPTkGdEiV/8qOe1MGnLHOLBmthA=
+github.com/onflow/flow-go-sdk v1.0.0-preview.54/go.mod h1:u9oFiS25TpnU1EW62PQlq22jzkwBAj4VEiiCBM6nhHo=
 github.com/onflow/flow-nft/lib/go/contracts v1.2.1 h1:woAAS5z651sDpi7ihAHll8NvRS9uFXIXkL6xR+bKFZY=
 github.com/onflow/flow-nft/lib/go/contracts v1.2.1/go.mod h1:2gpbza+uzs1k7x31hkpBPlggIRkI53Suo0n2AyA2HcE=
 github.com/onflow/flow-nft/lib/go/templates v1.2.0 h1:JSQyh9rg0RC+D1930BiRXN8lrtMs+ubVMK6aQPon6Yc=
 github.com/onflow/flow-nft/lib/go/templates v1.2.0/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.4.5 h1:6o+pgYGqwXdEhqSJxu2BdnDXkOQVOkfGAb6IiXB+NPM=
-github.com/onflow/flow/protobuf/go/flow v0.4.5/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
-github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.32 h1:7gzHh7ITIJyBMmqIfXtmu2i+XRFyfsDcdNAheyN2UdQ=
-github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.32/go.mod h1:0IuMeFtFbv1lCaoF7pB9U2trYjwMzqvuTgSj4mXZX24=
+github.com/onflow/flow/protobuf/go/flow v0.4.6 h1:KE/CsRVfyG5lGBtm1aNcjojMciQyS5GfPF3ixOWRfi0=
+github.com/onflow/flow/protobuf/go/flow v0.4.6/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
+github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.33 h1:vTUxBb0U/DEb/KHJ8cmI76xdeq08/uW9NNGS2Kny/Y4=
+github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.33/go.mod h1:GrI+Rmf4JXRvFKHwWoe/Bd5S3Tiiraqfto0RXrnGxfM=
 github.com/onflow/go-ethereum v1.14.7 h1:gg3awYqI02e3AypRdpJKEvNTJ6kz/OhAqRti0h54Wlc=
 github.com/onflow/go-ethereum v1.14.7/go.mod h1:zV14QLrXyYu5ucvcwHUA0r6UaqveqbXaehAVQJlSW+I=
 github.com/onflow/nft-storefront/lib/go/contracts v1.0.0 h1:sxyWLqGm/p4EKT6DUlQESDG1ZNMN9GjPCm1gTq7NGfc=

internal/evm/gateway.go

@@ -131,10 +131,15 @@ var gatewayCommand = &command.Command{
 
 		ctx, cancel := context.WithCancel(context.Background())
 
-		err = bootstrap.Start(ctx, cfg)
-		if err != nil {
-			panic(err)
-		}
+		ready := make(chan struct{})
+		go func() {
+			err = bootstrap.Run(ctx, cfg, ready)
+			if err != nil {
+				panic(err)
+			}
+		}()
+
+		<-ready
 
 		osSig := make(chan os.Signal, 1)
 		signal.Notify(osSig, syscall.SIGINT, syscall.SIGTERM)