Repository: onflow/flow-cli
Pull request #516 (2022-06-08 09:07:12)

Update Secure Cadence
This PR updates to
- [Cadence v0.24.0](https://github.com/onflow/cadence/releases/tag/v0.24.0)
- [Go SDK v0.26.0](https://github.com/onflow/flow-go-sdk/releases/tag/v0.26.0)
- [flow-go v0.26.3](https://github.com/onflow/flow-go/releases/tag/v0.26.3)
- [Emulator v0.33.0](https://github.com/onflow/flow-emulator/releases/tag/v0.33.0)
- [Cadence Language Server v0.24.0](https://github.com/onflow/cadence/releases/tag/languageserver%2Fv0.24.0)

______

For contributor use:

- [x] Targeted PR against `master` branch
- [x] Linked to Github issue with discussion and accepted design OR link to spec that describes this work
- [x] Code follows the [standards mentioned here](https://github.com/onflow/flow-cli/blob/master/CONTRIBUTING.md#styleguides)
- [x] Updated relevant documentation
- [x] Re-reviewed `Files changed` in the Github PR explorer
- [x] Added appropriate labels



Patch:
diff --git a/go.mod b/go.mod
index 70d5736b..35698d0a 100644
--- a/go.mod
+++ b/go.mod
@@ -9,13 +9,13 @@ require (
 	github.com/gosuri/uilive v0.0.4
 	github.com/joho/godotenv v1.4.0
 	github.com/manifoldco/promptui v0.9.0
-	github.com/onflow/cadence v0.21.3-0.20220601002855-8b113c539a2c
-	github.com/onflow/cadence/languageserver v0.23.5-0.20220520080030-2a9ba4e0aae7
+	github.com/onflow/cadence v0.24.1
+	github.com/onflow/cadence/languageserver v0.24.0
 	github.com/onflow/fcl-dev-wallet v0.4.2
 	github.com/onflow/flow-core-contracts/lib/go/templates v0.11.2-0.20220513155751-c4c1f8d59f83
-	github.com/onflow/flow-emulator v0.32.0
-	github.com/onflow/flow-go v0.26.2
-	github.com/onflow/flow-go-sdk v0.24.1-0.20220513205729-d1f58d47c4e3
+	github.com/onflow/flow-emulator v0.33.1
+	github.com/onflow/flow-go v0.26.3
+	github.com/onflow/flow-go-sdk v0.26.1
 	github.com/psiemens/sconfig v0.1.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/afero v1.8.2
diff --git a/go.sum b/go.sum
index bf9c86fa..488c2fbd 100644
--- a/go.sum
+++ b/go.sum
@@ -381,9 +381,13 @@ github.com/fxamacker/cbor/v2 v2.2.1-0.20210927235116-3d6d5d1de29b/go.mod h1:TA1x
 github.com/fxamacker/cbor/v2 v2.3.1-0.20211029162100-5d5d7c3edd41/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
 github.com/fxamacker/cbor/v2 v2.4.1-0.20220314011055-12f5cb4b5eb0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
 github.com/fxamacker/cbor/v2 v2.4.1-0.20220515183430-ad2eae63303f h1:dxTR4AaxCwuQv9LAVTAC2r1szlS+epeuPT5ClLKT6ZY=
+github.com/fxamacker/cbor/v2 v2.4.1-0.20220515183430-ad2eae63303f h1:dxTR4AaxCwuQv9LAVTAC2r1szlS+epeuPT5ClLKT6ZY=
+github.com/fxamacker/cbor/v2 v2.4.1-0.20220515183430-ad2eae63303f/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
 github.com/fxamacker/cbor/v2 v2.4.1-0.20220515183430-ad2eae63303f/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
 github.com/fxamacker/circlehash v0.1.0/go.mod h1:3aq3OfVvsWtkWMb6A1owjOQFA+TLsD5FgJflnaQwtMM=
 github.com/fxamacker/circlehash v0.3.0 h1:XKdvTtIJV9t7DDUtsf0RIpC1OcxZtPbmgIH7ekx28WA=
+github.com/fxamacker/circlehash v0.3.0 h1:XKdvTtIJV9t7DDUtsf0RIpC1OcxZtPbmgIH7ekx28WA=
+github.com/fxamacker/circlehash v0.3.0/go.mod h1:3aq3OfVvsWtkWMb6A1owjOQFA+TLsD5FgJflnaQwtMM=
 github.com/fxamacker/circlehash v0.3.0/go.mod h1:3aq3OfVvsWtkWMb6A1owjOQFA+TLsD5FgJflnaQwtMM=
 github.com/gammazero/deque v0.1.0/go.mod h1:KQw7vFau1hHuM8xmI9RbgKFbAsQFWmBpqQ2KenFLk6M=
 github.com/gammazero/workerpool v1.1.2/go.mod h1:UelbXcO0zCIGFcufcirHhq2/xtLXJdQ29qZNlXG9OjQ=
@@ -1362,6 +1366,8 @@ github.com/onflow/atree v0.1.0-beta1.0.20211027184039-559ee654ece9/go.mod h1:+6x
 github.com/onflow/atree v0.1.1/go.mod h1:95SqSEPgfijF1ZkLKbVgYVrfQzvP0fhayh555v1oLbs=
 github.com/onflow/atree v0.3.0/go.mod h1:tSPKjdmbNOQyVrSvcxKZG8+EDL4jdjoJBGAjNVk8zkA=
 github.com/onflow/atree v0.3.1-0.20220531231935-525fbc26f40a h1:ldQ7U2iddVJCwJA2ckK7y6AdH4INzxOSu2VnejkcBro=
+github.com/onflow/atree v0.3.1-0.20220531231935-525fbc26f40a h1:ldQ7U2iddVJCwJA2ckK7y6AdH4INzxOSu2VnejkcBro=
+github.com/onflow/atree v0.3.1-0.20220531231935-525fbc26f40a/go.mod h1:PZESmRR4bI/w/9nEDCqRoWxBq/jFNUEzkfypHf0j8cw=
 github.com/onflow/atree v0.3.1-0.20220531231935-525fbc26f40a/go.mod h1:PZESmRR4bI/w/9nEDCqRoWxBq/jFNUEzkfypHf0j8cw=
 github.com/onflow/cadence v0.14.2/go.mod h1:EEXKRNuW5C2E1wRM4fLhfqoTgXohPFieXwOGJubz1Jg=
 github.com/onflow/cadence v0.15.0/go.mod h1:KMzDF6cIv6nb5PJW9aITaqazbmJX8MMeibFcpPP385M=
@@ -1372,19 +1378,20 @@ github.com/onflow/cadence v0.18.0/go.mod h1:iR/tZpP+1YhM8iRnOBPiBIs7on5dE3hk2Zfu
 github.com/onflow/cadence v0.18.1-0.20210617175100-225316245130/go.mod h1:iR/tZpP+1YhM8iRnOBPiBIs7on5dE3hk2ZfunCRQswE=
 github.com/onflow/cadence v0.20.1/go.mod h1:7mzUvPZUIJztIbr9eTvs+fQjWWHTF8veC+yk4ihcNIA=
 github.com/onflow/cadence v0.21.0/go.mod h1:KBxn7AyO+R2RFpFHjsWKJFAokyJaCZXc9Hr9MlEOq9g=
-github.com/onflow/cadence v0.21.3-0.20220317173919-b23d45bcd67d/go.mod h1:vNIxF13e1Ty50KnkQSm6LVwvxGGLTQ4kpldvTL+2S6s=
 github.com/onflow/cadence v0.21.3-0.20220419065337-d5202c162010/go.mod h1:vNIxF13e1Ty50KnkQSm6LVwvxGGLTQ4kpldvTL+2S6s=
-github.com/onflow/cadence v0.21.3-0.20220509200929-9a1afbeeb449/go.mod h1:vNIxF13e1Ty50KnkQSm6LVwvxGGLTQ4kpldvTL+2S6s=
 github.com/onflow/cadence v0.21.3-0.20220511225809-808fe14141df/go.mod h1:vNIxF13e1Ty50KnkQSm6LVwvxGGLTQ4kpldvTL+2S6s=
 github.com/onflow/cadence v0.21.3-0.20220513161637-08b93d4bb7b9/go.mod h1:vNIxF13e1Ty50KnkQSm6LVwvxGGLTQ4kpldvTL+2S6s=
-github.com/onflow/cadence v0.21.3-0.20220601002855-8b113c539a2c h1:l2Oc/aZ1FbzJBU5bbsBm6jjYe7aHLOp++ymLL2dTHRQ=
 github.com/onflow/cadence v0.21.3-0.20220601002855-8b113c539a2c/go.mod h1:FliGP1FZLEuSemnSf8pKItDzW7E2cvPukx/SsE1+oCo=
+github.com/onflow/cadence v0.24.0/go.mod h1:tIJiQ4RIq1WUTXdBewv8p+gNUETN93Eb7jSFedjqs5w=
+github.com/onflow/cadence v0.24.1 h1:ERWaKaNXyeUwJkVp+66Yfp/DsojrzQ0btvY3D6XK9sY=
+github.com/onflow/cadence v0.24.1/go.mod h1:tIJiQ4RIq1WUTXdBewv8p+gNUETN93Eb7jSFedjqs5w=
 github.com/onflow/cadence/languageserver v0.15.2/go.mod h1:hQGE8dYH5CfQ1Oe0nXglchgURzZwR3JQhmuXtv4ROHs=
 github.com/onflow/cadence/languageserver v0.16.0/go.mod h1:UPV1so9LcMrhj27IegrTucoyS4TLRVjNr4DJqjqBhFA=
 github.com/onflow/cadence/languageserver v0.18.2/go.mod h1:ehuDCUevEEavUzgJqLevcZPjfmTzMBX7Sglbi5ur9uU=
-github.com/onflow/cadence/languageserver v0.20.3-0.20220318125647-b76192706c44/go.mod h1:UVQTWTtpNCn3SdOKsDMoCitpQxuoDuecGsUW0m7GsIc=
-github.com/onflow/cadence/languageserver v0.23.5-0.20220520080030-2a9ba4e0aae7 h1:arCbnUYPBqH34Ga1DwQFXM0EE1iWcexdkMFXZAnSewc=
-github.com/onflow/cadence/languageserver v0.23.5-0.20220520080030-2a9ba4e0aae7/go.mod h1:q/KXbzJthcml31bLLN3ZH8I00jgQg23NJnK0jjNv5nc=
+github.com/onflow/cadence/languageserver v0.18.3-0.20220202133308-207188a51831/go.mod h1:sOABh+6LBUWgY6r5iYhu98mDgfiBVTXAKVYHPQV/nvo=
+github.com/onflow/cadence/languageserver v0.23.5-0.20220608222314-31dcf01be513/go.mod h1:ZC1GZu2Eerl5lkyvCn7FT51GhPUWmuqX+cYfosms7AA=
+github.com/onflow/cadence/languageserver v0.24.0 h1:LufBiLHJt9LmWhVVpxaLHO/yRvVsPNpKKEdo6ykyB/U=
+github.com/onflow/cadence/languageserver v0.24.0/go.mod h1:5w1rJx0mvrto0EvWgZkbF4STuK2SggMyamwL1spTGlQ=
 github.com/onflow/fcl-dev-wallet v0.4.2 h1:tmYVoWBKunsj+YYY7cI1OyW/xcYaKfY5QtezwXVT19w=
 github.com/onflow/fcl-dev-wallet v0.4.2/go.mod h1:xWVEyGZgdDt4/+PLSlpuqhtzobjnWy5giceIGoErPzs=
 github.com/onflow/flow v0.2.3-0.20220131193101-d4e2ca43a621/go.mod h1:lzyAYmbu1HfkZ9cfnL5/sjrrsnJiUU8fRL26CqLP7+c=
@@ -1395,21 +1402,18 @@ github.com/onflow/flow v0.3.1/go.mod h1:lzyAYmbu1HfkZ9cfnL5/sjrrsnJiUU8fRL26CqLP
 github.com/onflow/flow-cli v0.20.3-0.20210512000809-474effb7e7db/go.mod h1:Yh4dgrNiZdXhbU+3UVUmo4gRM0TEBVvhW4ITKVo82dg=
 github.com/onflow/flow-cli v0.23.1-0.20210621124332-11c4cd22ffb4/go.mod h1:OD9UVPFIvktnO86dSLavf1tTVFIsKQ5By5KBBDLfC3Q=
 github.com/onflow/flow-cli v0.30.3-0.20220202132709-c9157226af28/go.mod h1:8g9X+IB3lALiTzMIRFkTJzuLcfYawMp2WzLhs90NJfU=
-github.com/onflow/flow-cli v0.31.2-sc/go.mod h1:cObPFvlts7ANLINoJwAGMO9z2EiwT51zypQYnhYOM9A=
+github.com/onflow/flow-cli v0.35.1-0.20220608222158-caf50623fa2a/go.mod h1:S7HNLguG3yHk+gjtRdN/hmuOpNl+2cqCQahXpgCUTHs=
+github.com/onflow/flow-cli v0.35.1-0.20220608231110-c253ad512117/go.mod h1:0WJHxtoBaLl2/wfiwnCocTy2WADrbzeTwPO8etJZH4Q=
 github.com/onflow/flow-core-contracts/lib/go/contracts v0.7.2/go.mod h1:IZ2e7UyLCYmpQ8Kd7k0A32uXqdqfiV1r2sKs5/riblo=
 github.com/onflow/flow-core-contracts/lib/go/contracts v0.7.3-0.20210527134022-58c25247091a/go.mod h1:IZ2e7UyLCYmpQ8Kd7k0A32uXqdqfiV1r2sKs5/riblo=
 github.com/onflow/flow-core-contracts/lib/go/contracts v0.7.3/go.mod h1:MSNt2rodpRXm1n0iGQWL6ltDoJCtXEzlPw9nhE/zQmk=
 github.com/onflow/flow-core-contracts/lib/go/contracts v0.9.0/go.mod h1:MSNt2rodpRXm1n0iGQWL6ltDoJCtXEzlPw9nhE/zQmk=
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.10.2-0.20220316181225-1ae94da816da/go.mod h1:MSNt2rodpRXm1n0iGQWL6ltDoJCtXEzlPw9nhE/zQmk=
-github.com/onflow/flow-core-contracts/lib/go/contracts v0.11.0/go.mod h1:MSNt2rodpRXm1n0iGQWL6ltDoJCtXEzlPw9nhE/zQmk=
 github.com/onflow/flow-core-contracts/lib/go/contracts v0.11.2-0.20220413172500-d89ca96e6db3/go.mod h1:T6yhM+kWrFxiP6F3hh8lh9DcocHfmv48P4ITnjLhKSk=
 github.com/onflow/flow-core-contracts/lib/go/contracts v0.11.2-0.20220422202806-92ad02a996cc/go.mod h1:T6yhM+kWrFxiP6F3hh8lh9DcocHfmv48P4ITnjLhKSk=
 github.com/onflow/flow-core-contracts/lib/go/contracts v0.11.2-0.20220513155751-c4c1f8d59f83 h1:mpJirFu/JWMLV0IhKDZleVrVdN5B8QERV4gSXDef5bA=
 github.com/onflow/flow-core-contracts/lib/go/contracts v0.11.2-0.20220513155751-c4c1f8d59f83/go.mod h1:T6yhM+kWrFxiP6F3hh8lh9DcocHfmv48P4ITnjLhKSk=
 github.com/onflow/flow-core-contracts/lib/go/templates v0.6.0/go.mod h1:fLJbjGUHrlHdrjaeRDgKG9nZJ6spiCScc+Q5SARgH38=
 github.com/onflow/flow-core-contracts/lib/go/templates v0.9.0/go.mod h1:ckE1lQ18DQVLH9gI63JnGLmBJL/Bo8FPsgYefcWpWhg=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.10.1/go.mod h1:ckE1lQ18DQVLH9gI63JnGLmBJL/Bo8FPsgYefcWpWhg=
-github.com/onflow/flow-core-contracts/lib/go/templates v0.11.0/go.mod h1:ckE1lQ18DQVLH9gI63JnGLmBJL/Bo8FPsgYefcWpWhg=
 github.com/onflow/flow-core-contracts/lib/go/templates v0.11.2-0.20220413172500-d89ca96e6db3/go.mod h1:JB2hWVxUjhMshUDNVQKfn4dzhhawOO+i3XjlhLMV5MM=
 github.com/onflow/flow-core-contracts/lib/go/templates v0.11.2-0.20220422202806-92ad02a996cc/go.mod h1:JB2hWVxUjhMshUDNVQKfn4dzhhawOO+i3XjlhLMV5MM=
 github.com/onflow/flow-core-contracts/lib/go/templates v0.11.2-0.20220513155751-c4c1f8d59f83 h1:w4uXFTvjQmLtA/X50H4YXVlzbdsoL3vDI3Y86jtJOMM=
@@ -1418,13 +1422,14 @@ github.com/onflow/flow-emulator v0.19.0/go.mod h1:k5un51XlFJavboagCqTxd6x8Gle7lx
 github.com/onflow/flow-emulator v0.20.3/go.mod h1:xNdVsrMJiAaYJ59Dwo+xvj0ENdvk/bI14zkGN4V0ozs=
 github.com/onflow/flow-emulator v0.21.0/go.mod h1:/2dNG6K4fKtpZsazdIeK8Fs0IWXUzqvO3qK5467pYsc=
 github.com/onflow/flow-emulator v0.28.1-0.20220202131242-21a2c6e3eac7/go.mod h1:75iLaCkteYi8VsRnPH7RC9jeKjOIXogFq4TkPU71r1c=
-github.com/onflow/flow-emulator v0.28.2-0.20220317212920-d2b812b3ba2e/go.mod h1:zsocr7EBhku+9q5qGadrb8L1F/w0F1SDVl6B+kBeM2c=
-github.com/onflow/flow-emulator v0.29.0-sc/go.mod h1:zsocr7EBhku+9q5qGadrb8L1F/w0F1SDVl6B+kBeM2c=
 github.com/onflow/flow-emulator v0.30.1-0.20220421153717-0a0abc4d580b/go.mod h1:5IsytpArI/wN2ZZXCRAAcIp/223PmVDnmPxbRZO6IbU=
 github.com/onflow/flow-emulator v0.31.2-0.20220421202209-eb83f9bfda53/go.mod h1:4jyaXs+wHHI0JlBi3/+K9DciPzIve3+MFrNXRAnBEl4=
 github.com/onflow/flow-emulator v0.31.2-0.20220513151845-ef7513cb1cd0/go.mod h1:XLZfTEaYX2151TcTvZPIj7taBN0qpsOoyvEBRZzlXtQ=
-github.com/onflow/flow-emulator v0.32.0 h1:Rlmb83U9SBHWP0oTZS70DqG9WJfxpvanJrBSDzEP2Nw=
-github.com/onflow/flow-emulator v0.32.0/go.mod h1:S8TLiS1clQl5GEsHdJ7V7BcRfU3dAwg1RWV6dLgp1cI=
+github.com/onflow/flow-emulator v0.32.1-0.20220608200416-af3f5ba3f673/go.mod h1:1HEDTQqXL2PUFRAJmKKs0/YgPUKgGSeIziwBeIBOTjM=
+github.com/onflow/flow-emulator v0.32.1-0.20220608220535-c3d005f9ac92/go.mod h1:LdwNLQPNOUlB5extFJohIOzsnhbZhPhC7HzrStex6L8=
+github.com/onflow/flow-emulator v0.33.0/go.mod h1:LdwNLQPNOUlB5extFJohIOzsnhbZhPhC7HzrStex6L8=
+github.com/onflow/flow-emulator v0.33.1 h1:OR4ZMKJKwTFD+INY5kICSmN16N1LFGzR0uDb+Qq92us=
+github.com/onflow/flow-emulator v0.33.1/go.mod h1:+nQeTdyc+mUtSVc182fOYBvgmjIQFRtUu0h1yf1R4Tk=
 github.com/onflow/flow-ft/lib/go/contracts v0.5.0 h1:Cg4gHGVblxcejfNNG5Mfj98Wf4zbY76O0Y28QB0766A=
 github.com/onflow/flow-ft/lib/go/contracts v0.5.0/go.mod h1:1zoTjp1KzNnOPkyqKmWKerUyf0gciw+e6tAEt0Ks3JE=
 github.com/onflow/flow-go v0.16.3-0.20210427194927-6050c2a3ae42/go.mod h1:9GUEbBhOGDVf91ZJB6QWqVNQkrM3INEudNyDtIttOu0=
@@ -1432,12 +1437,13 @@ github.com/onflow/flow-go v0.17.1/go.mod h1:j8zCo01+2pJL00qpOnwdOqU7spTgOLHFRUp9
 github.com/onflow/flow-go v0.18.0/go.mod h1:cQpvFoqth9PR7tarWDa36R/dDOqUK5QYfeYzCdXPLII=
 github.com/onflow/flow-go v0.18.2-canary/go.mod h1:mGzTPbzG1YrckrFQfjCw6NzfflP1o3TjRxI9LRWZbpc=
 github.com/onflow/flow-go v0.23.2-0.20220201222302-cff34195a61a/go.mod h1:ci9UXmbx+2nloojjgXCaBCFhpYjssgRNH/s+HEATuzA=
-github.com/onflow/flow-go v0.25.1-0.20220317203627-1c99893f6f6a/go.mod h1:AwVzaD7UxAdTueQjKjeQoRV+ZJUfTDlJCg1A0FIsDI8=
 github.com/onflow/flow-go v0.25.8-0.20220420171205-833e2e8849b1/go.mod h1:tXHoKoHvUoS+xqmNI+5rJ1bzvWPLkFgH4GAs8iRESC0=
 github.com/onflow/flow-go v0.25.13-0.20220421201202-a0a5911268b6/go.mod h1:DhXeK/9n3dAe7b1hxdxdq0BNbv53+2IwoYGJ1VK5MFc=
 github.com/onflow/flow-go v0.25.13-0.20220513151142-7858f76e703b/go.mod h1:GU4O0LFkSHnuTvyi03bax+ANAUVf3EZ5YsH8biZQsG4=
-github.com/onflow/flow-go v0.26.2 h1:WEdXlop9SBiq6YicwPCCNwJ5AlwT3JY7KqNMznMhMnI=
+github.com/onflow/flow-go v0.25.13-0.20220609230330-ac8d2d78c212/go.mod h1:sYytNEocAABNMNEPxvtbhYxhHpd4ljtHYn3AC9UUC1I=
 github.com/onflow/flow-go v0.26.2/go.mod h1:RCc7ztvK/XEuN5G6CYyO7x50Lfz+hSvS/HSdVsLf/Wk=
+github.com/onflow/flow-go v0.26.3 h1:q1af+gkJd4xzxICtzkOHAopcX4kntozuNgr53iKcVHI=
+github.com/onflow/flow-go v0.26.3/go.mod h1:MDUuR+YWgmiW9XY1bW7FOFcsULBCoG5VNr87EQbtyDk=
 github.com/onflow/flow-go-sdk v0.18.0/go.mod h1:AjXHdxguP/PK5P8tWKHH4jR6oLISTgLoXXQrbQsHY+E=
 github.com/onflow/flow-go-sdk v0.19.0/go.mod h1:52QZyLwU3p3UZ2FXOy+sRl4JPdtvJoae1spIUBOFxA8=
 github.com/onflow/flow-go-sdk v0.20.0-alpha.1/go.mod h1:52QZyLwU3p3UZ2FXOy+sRl4JPdtvJoae1spIUBOFxA8=
@@ -1446,8 +1452,10 @@ github.com/onflow/flow-go-sdk v0.24.0/go.mod h1:IoptMLPyFXWvyd9yYA6/4EmSeeozl6nJ
 github.com/onflow/flow-go-sdk v0.24.1-0.20220419204316-4f7efebeb2e9/go.mod h1:8LExIqsYMJHkC/h1OKd7XkRmPR6jA7bFv5eFtFXpv14=
 github.com/onflow/flow-go-sdk v0.24.1-0.20220421152843-9ce4d554036e/go.mod h1:d0tO4l/bpLhISgYw1or2p5ee5xeJbnWgnU9CGUkvLO8=
 github.com/onflow/flow-go-sdk v0.24.1-0.20220512181452-dec47e8451bb/go.mod h1:KQXwCCKgKE5JO9AlgQwFE3u4kFlQO/zSmlVSwcA8I+4=
-github.com/onflow/flow-go-sdk v0.24.1-0.20220513205729-d1f58d47c4e3 h1:dHAQxa6qPYmiBz70jryxPYOkQp1efn1R+OS58r1QW5A=
 github.com/onflow/flow-go-sdk v0.24.1-0.20220513205729-d1f58d47c4e3/go.mod h1:cDUwD383pSyvlKueB7lxNI10/mfS+2EWeZOmeJaxZiE=
+github.com/onflow/flow-go-sdk v0.26.0/go.mod h1:PzRE6FkdcIEl10M3H/cRnsj8SRJzKgaXqQCvLO1cOL0=
+github.com/onflow/flow-go-sdk v0.26.1 h1:v0rzbBQPy+LEuAmX6d7E9TUBUW6lLyBIStUxchXwh9k=
+github.com/onflow/flow-go-sdk v0.26.1/go.mod h1:Z0SxMQgapt5aBgIdI3trG+IvAAux8WAvCKhgZ7tP6dQ=
 github.com/onflow/flow-go/crypto v0.12.0/go.mod h1:oXuvU0Dr4lHKgye6nHEFbBXIWNv+dBQUzoVW5Go38+o=
 github.com/onflow/flow-go/crypto v0.18.0/go.mod h1:3Ah843iPyjIL+7nH9EillV3OWNptrL+DrQUbVKgg2E4=
 github.com/onflow/flow-go/crypto v0.21.3/go.mod h1:vI6V4CY3R6c4JKBxdcRiR/AnjBfL8OSD97bJc60cLuQ=
@@ -1461,15 +1469,15 @@ github.com/onflow/flow/protobuf/go/flow v0.1.9/go.mod h1:kRugbzZjwQqvevJhrnnCFMJ
 github.com/onflow/flow/protobuf/go/flow v0.2.0/go.mod h1:kRugbzZjwQqvevJhrnnCFMJZNmoSJmxlKt6hTGXZojM=
 github.com/onflow/flow/protobuf/go/flow v0.2.2/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8=
 github.com/onflow/flow/protobuf/go/flow v0.2.3/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8=
-github.com/onflow/flow/protobuf/go/flow v0.2.4-0.20220304041411-6d91cd04a33a/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8=
 github.com/onflow/flow/protobuf/go/flow v0.2.4/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8=
 github.com/onflow/flow/protobuf/go/flow v0.2.5/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8=
 github.com/onflow/flow/protobuf/go/flow v0.3.1 h1:4I8ykG6naR3n8Or6eXrZDaGVaoztb3gP2KJ6XKyDufg=
 github.com/onflow/flow/protobuf/go/flow v0.3.1/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8=
 github.com/onflow/fusd/lib/go/contracts v0.0.0-20211021081023-ae9de8fb2c7e h1:RHaXPHvWCy3VM62+HTyu6DYq5T8rrK1gxxqogKuJ4S4=
 github.com/onflow/fusd/lib/go/contracts v0.0.0-20211021081023-ae9de8fb2c7e/go.mod h1:CRX9eXtc9zHaRVTW1Xh4Cf5pZgKkQuu1NuSEVyHXr/0=
-github.com/onflow/sdks v0.4.2 h1:UdnXOdcIPIdD02n2SxQVGTJBAxGqJBgOkThxI3/IDnk=
 github.com/onflow/sdks v0.4.2/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU=
+github.com/onflow/sdks v0.4.4 h1:aJPGJJLAN+mlBWAQxsyuJXeRRMFeLwU6Mp4e/YL6bdU=
+github.com/onflow/sdks v0.4.4/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -2492,7 +2500,6 @@ google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ6
 google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220211171837-173942840c17/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
 google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
 google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf h1:SVYXkUz2yZS9FWb2Gm8ivSlbNQzL2Z/NpPKE3RG2jWk=
 google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
diff --git a/internal/blocks/blocks.go b/internal/blocks/blocks.go
index 005dd8b8..2f7df067 100644
--- a/internal/blocks/blocks.go
+++ b/internal/blocks/blocks.go
@@ -25,7 +25,6 @@ import (
 	"github.com/onflow/flow-cli/internal/command"
 
 	"github.com/onflow/flow-go-sdk"
-	"github.com/onflow/flow-go-sdk/client"
 	"github.com/spf13/cobra"
 
 	"github.com/onflow/flow-cli/internal/events"
@@ -44,7 +43,7 @@ func init() {
 
 type BlockResult struct {
 	block       *flow.Block
-	events      []client.BlockEvents
+	events      []flow.BlockEvents
 	collections []*flow.Collection
 	included    []string
 }
diff --git a/internal/command/result.go b/internal/command/result.go
index b903bcbd..51427408 100644
--- a/internal/command/result.go
+++ b/internal/command/result.go
@@ -25,7 +25,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/onflow/flow-go-sdk/client"
+	"github.com/onflow/flow-go-sdk/access/grpc"
 	"github.com/spf13/afero"
 
 	"github.com/onflow/flow-cli/pkg/flowkit/config"
@@ -137,7 +137,7 @@ func handleError(description string, err error) {
 	// TODO(sideninja): refactor this to better handle errors not by string matching
 	// handle rpc error
 	switch t := err.(type) {
-	case *client.RPCError:
+	case *grpc.RPCError:
 		_, _ = fmt.Fprintf(os.Stderr, "%s Grpc Error: %s \n", output.ErrorEmoji(), t.GRPCStatus().Err().Error())
 	default:
 		if errors.Is(err, config.ErrOutdatedFormat) {
diff --git a/internal/events/events.go b/internal/events/events.go
index 4b76b162..d168cf42 100644
--- a/internal/events/events.go
+++ b/internal/events/events.go
@@ -29,7 +29,6 @@ import (
 	"github.com/onflow/cadence"
 	jsoncdc "github.com/onflow/cadence/encoding/json"
 	"github.com/onflow/flow-go-sdk"
-	"github.com/onflow/flow-go-sdk/client"
 	"github.com/spf13/cobra"
 )
 
@@ -44,7 +43,7 @@ func init() {
 }
 
 type EventResult struct {
-	BlockEvents []client.BlockEvents
+	BlockEvents []flow.BlockEvents
 	Events      []flow.Event
 }
 
diff --git a/pkg/flowkit/gateway/emulator.go b/pkg/flowkit/gateway/emulator.go
index a4916072..6c5cb95d 100644
--- a/pkg/flowkit/gateway/emulator.go
+++ b/pkg/flowkit/gateway/emulator.go
@@ -23,14 +23,13 @@ import (
 	"fmt"
 
 	"github.com/onflow/cadence"
+	jsoncdc "github.com/onflow/cadence/encoding/json"
 	emulator "github.com/onflow/flow-emulator"
 	"github.com/onflow/flow-emulator/convert/sdk"
 	"google.golang.org/grpc/status"
 
 	"github.com/onflow/flow-emulator/server/backend"
 	"github.com/onflow/flow-go-sdk"
-	"github.com/onflow/flow-go-sdk/client"
-	"github.com/onflow/flow-go-sdk/client/convert"
 	flowGo "github.com/onflow/flow-go/model/flow"
 	"github.com/sirupsen/logrus"
 
@@ -147,7 +146,7 @@ func (g *EmulatorGateway) Ping() error {
 
 func (g *EmulatorGateway) ExecuteScript(script []byte, arguments []cadence.Value) (cadence.Value, error) {
 
-	args, err := convert.CadenceValuesToMessages(arguments)
+	args, err := cadenceValuesToMessages(arguments)
 	if err != nil {
 		return nil, UnwrapStatusError(err)
 	}
@@ -157,7 +156,7 @@ func (g *EmulatorGateway) ExecuteScript(script []byte, arguments []cadence.Value
 		return nil, UnwrapStatusError(err)
 	}
 
-	value, err := convert.MessageToCadenceValue(result)
+	value, err := messageToCadenceValue(result)
 	if err != nil {
 		return nil, UnwrapStatusError(err)
 	}
@@ -174,6 +173,27 @@ func (g *EmulatorGateway) GetLatestBlock() (*flow.Block, error) {
 	return convertBlock(block), nil
 }
 
+func cadenceValuesToMessages(values []cadence.Value) ([][]byte, error) {
+	msgs := make([][]byte, len(values))
+	for i, val := range values {
+		msg, err := jsoncdc.Encode(val)
+		if err != nil {
+			return nil, fmt.Errorf("convert: %w", err)
+		}
+		msgs[i] = msg
+	}
+	return msgs, nil
+}
+
+func messageToCadenceValue(m []byte) (cadence.Value, error) {
+	v, err := jsoncdc.Decode(nil, m)
+	if err != nil {
+		return nil, fmt.Errorf("convert: %w", err)
+	}
+
+	return v, nil
+}
+
 func convertBlock(block *flowGo.Block) *flow.Block {
 	return &flow.Block{
 		BlockHeader: flow.BlockHeader{
@@ -193,8 +213,8 @@ func (g *EmulatorGateway) GetEvents(
 	eventType string,
 	startHeight uint64,
 	endHeight uint64,
-) ([]client.BlockEvents, error) {
-	events := make([]client.BlockEvents, 0)
+) ([]flow.BlockEvents, error) {
+	events := make([]flow.BlockEvents, 0)
 
 	for height := startHeight; height <= endHeight; height++ {
 		events = append(events, g.getBlockEvent(height, eventType))
@@ -203,13 +223,13 @@ func (g *EmulatorGateway) GetEvents(
 	return events, nil
 }
 
-func (g *EmulatorGateway) getBlockEvent(height uint64, eventType string) client.BlockEvents {
+func (g *EmulatorGateway) getBlockEvent(height uint64, eventType string) flow.BlockEvents {
 	block, _ := g.backend.GetBlockByHeight(g.ctx, height)
 	events, _ := g.backend.GetEventsForBlockIDs(g.ctx, eventType, []flow.Identifier{flow.Identifier(block.ID())})
 
-	result := client.BlockEvents{
+	result := flow.BlockEvents{
 		BlockID:        flow.Identifier(block.ID()),
-		Height:         uint64(block.Header.Height),
+		Height:         block.Header.Height,
 		BlockTimestamp: block.Header.Timestamp,
 		Events:         []flow.Event{},
 	}
diff --git a/pkg/flowkit/gateway/gateway.go b/pkg/flowkit/gateway/gateway.go
index 3667a4ff..dd7e269a 100644
--- a/pkg/flowkit/gateway/gateway.go
+++ b/pkg/flowkit/gateway/gateway.go
@@ -23,7 +23,6 @@ import (
 
 	"github.com/onflow/cadence"
 	"github.com/onflow/flow-go-sdk"
-	"github.com/onflow/flow-go-sdk/client"
 )
 
 // Gateway describes blockchain access interface
@@ -36,7 +35,7 @@ type Gateway interface {
 	GetLatestBlock() (*flow.Block, error)
 	GetBlockByHeight(uint64) (*flow.Block, error)
 	GetBlockByID(flow.Identifier) (*flow.Block, error)
-	GetEvents(string, uint64, uint64) ([]client.BlockEvents, error)
+	GetEvents(string, uint64, uint64) ([]flow.BlockEvents, error)
 	GetCollection(flow.Identifier) (*flow.Collection, error)
 	GetLatestProtocolStateSnapshot() ([]byte, error)
 	Ping() error
diff --git a/pkg/flowkit/gateway/grpc.go b/pkg/flowkit/gateway/grpc.go
index 7923b4c9..617ccc1e 100644
--- a/pkg/flowkit/gateway/grpc.go
+++ b/pkg/flowkit/gateway/grpc.go
@@ -24,13 +24,13 @@ import (
 	"strings"
 	"time"
 
+	grpcAccess "github.com/onflow/flow-go-sdk/access/grpc"
 	"github.com/onflow/flow-go/utils/grpcutils"
 
 	"github.com/onflow/flow-cli/pkg/flowkit"
 
 	"github.com/onflow/cadence"
 	"github.com/onflow/flow-go-sdk"
-	"github.com/onflow/flow-go-sdk/client"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )
@@ -41,7 +41,7 @@ const maxGRPCMessageSize = 1024 * 1024 * 16
 
 // GrpcGateway is a gateway implementation that uses the Flow Access gRPC API.
 type GrpcGateway struct {
-	client       *client.Client
+	client       *grpcAccess.Client
 	ctx          context.Context
 	secureClient bool
 }
@@ -49,7 +49,7 @@ type GrpcGateway struct {
 // NewGrpcGateway returns a new gRPC gateway.
 func NewGrpcGateway(host string) (*GrpcGateway, error) {
 
-	gClient, err := client.New(
+	gClient, err := grpcAccess.NewClient(
 		host,
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
 		grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxGRPCMessageSize)),
@@ -74,7 +74,7 @@ func NewSecureGrpcGateway(host, hostNetworkKey string) (*GrpcGateway, error) {
 		return nil, fmt.Errorf("failed to create secure GRPC dial options with network key \"%s\": %w", hostNetworkKey, err)
 	}
 
-	gClient, err := client.New(
+	gClient, err := grpcAccess.NewClient(
 		host,
 		secureDialOpts,
 		grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxGRPCMessageSize)),
@@ -165,15 +165,13 @@ func (g *GrpcGateway) GetEvents(
 	eventType string,
 	startHeight uint64,
 	endHeight uint64,
-) ([]client.BlockEvents, error) {
+) ([]flow.BlockEvents, error) {
 
 	events, err := g.client.GetEventsForHeightRange(
 		g.ctx,
-		client.EventRangeQuery{
-			Type:        eventType,
-			StartHeight: startHeight,
-			EndHeight:   endHeight,
-		},
+		eventType,
+		startHeight,
+		endHeight,
 	)
 
 	return events, err
diff --git a/pkg/flowkit/keys.go b/pkg/flowkit/keys.go
index 78242838..a6eb249b 100644
--- a/pkg/flowkit/keys.go
+++ b/pkg/flowkit/keys.go
@@ -219,7 +219,7 @@ func newHexAccountKey(accountKey config.AccountKey) (*HexAccountKey, error) {
 }
 
 func (a *HexAccountKey) Signer(ctx context.Context) (crypto.Signer, error) {
-	return crypto.NewInMemorySigner(a.privateKey, a.HashAlgo()), nil
+	return crypto.NewInMemorySigner(a.privateKey, a.HashAlgo())
 }
 
 func (a *HexAccountKey) PrivateKey() (*crypto.PrivateKey, error) {
diff --git a/pkg/flowkit/services/blocks.go b/pkg/flowkit/services/blocks.go
index a9c101b4..cf53cf4c 100644
--- a/pkg/flowkit/services/blocks.go
+++ b/pkg/flowkit/services/blocks.go
@@ -25,7 +25,6 @@ import (
 	"github.com/onflow/flow-cli/pkg/flowkit"
 
 	"github.com/onflow/flow-go-sdk"
-	"github.com/onflow/flow-go-sdk/client"
 
 	"github.com/onflow/flow-cli/pkg/flowkit/gateway"
 	"github.com/onflow/flow-cli/pkg/flowkit/output"
@@ -61,7 +60,7 @@ func (e *Blocks) GetBlock(
 	query string,
 	eventType string,
 	verbose bool,
-) (*flow.Block, []client.BlockEvents, []*flow.Collection, error) {
+) (*flow.Block, []flow.BlockEvents, []*flow.Collection, error) {
 	e.logger.StartProgress("Fetching Block...")
 	defer e.logger.StopProgress()
 
@@ -87,7 +86,7 @@ func (e *Blocks) GetBlock(
 	}
 
 	// if we specify event get events by the type
-	var events []client.BlockEvents
+	var events []flow.BlockEvents
 	if eventType != "" {
 		events, err = e.gateway.GetEvents(eventType, block.Height, block.Height)
 		if err != nil {
diff --git a/pkg/flowkit/services/events.go b/pkg/flowkit/services/events.go
index 2b049c66..934a71f1 100644
--- a/pkg/flowkit/services/events.go
+++ b/pkg/flowkit/services/events.go
@@ -22,9 +22,10 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/onflow/flow-cli/pkg/flowkit"
+	"github.com/onflow/flow-go-sdk"
+	"github.com/onflow/flow-go-sdk/access/grpc"
 
-	"github.com/onflow/flow-go-sdk/client"
+	"github.com/onflow/flow-cli/pkg/flowkit"
 
 	"github.com/onflow/flow-cli/pkg/flowkit/gateway"
 	"github.com/onflow/flow-cli/pkg/flowkit/output"
@@ -50,8 +51,8 @@ func NewEvents(
 	}
 }
 
-func makeEventQueries(events []string, startHeight uint64, endHeight uint64, blockCount uint64) []client.EventRangeQuery {
-	var queries []client.EventRangeQuery
+func makeEventQueries(events []string, startHeight uint64, endHeight uint64, blockCount uint64) []grpc.EventRangeQuery {
+	var queries []grpc.EventRangeQuery
 	for startHeight <= endHeight {
 		suggestedEndHeight := startHeight + blockCount - 1 //since we are inclusive
 		end := endHeight
@@ -59,7 +60,7 @@ func makeEventQueries(events []string, startHeight uint64, endHeight uint64, blo
 			end = suggestedEndHeight
 		}
 		for _, event := range events {
-			queries = append(queries, client.EventRangeQuery{
+			queries = append(queries, grpc.EventRangeQuery{
 				Type:        event,
 				StartHeight: startHeight,
 				EndHeight:   end,
@@ -70,7 +71,7 @@ func makeEventQueries(events []string, startHeight uint64, endHeight uint64, blo
 	return queries
 
 }
-func (e *Events) Get(events []string, startHeight uint64, endHeight uint64, blockCount uint64, workerCount int) ([]client.BlockEvents, error) {
+func (e *Events) Get(events []string, startHeight uint64, endHeight uint64, blockCount uint64, workerCount int) ([]flow.BlockEvents, error) {
 	if endHeight < startHeight {
 		return nil, fmt.Errorf("cannot have end height (%d) of block range less that start height (%d)", endHeight, startHeight)
 	}
@@ -80,7 +81,7 @@ func (e *Events) Get(events []string, startHeight uint64, endHeight uint64, bloc
 
 	queries := makeEventQueries(events, startHeight, endHeight, blockCount)
 
-	jobChan := make(chan client.EventRangeQuery, workerCount)
+	jobChan := make(chan grpc.EventRangeQuery, workerCount)
 	results := make(chan EventWorkerResult)
 
 	var wg sync.WaitGroup
@@ -107,7 +108,7 @@ func (e *Events) Get(events []string, startHeight uint64, endHeight uint64, bloc
 		}
 	}()
 
-	var resultEvents []client.BlockEvents
+	var resultEvents []flow.BlockEvents
 	for eventResult := range results {
 		if eventResult.Error != nil {
 			return nil, eventResult.Error
@@ -120,7 +121,7 @@ func (e *Events) Get(events []string, startHeight uint64, endHeight uint64, bloc
 
 }
 
-func (e *Events) eventWorker(jobChan <-chan client.EventRangeQuery, results chan<- EventWorkerResult) {
+func (e *Events) eventWorker(jobChan <-chan grpc.EventRangeQuery, results chan<- EventWorkerResult) {
 	for q := range jobChan {
 		//e.logger.Debug(fmt.Sprintf("Fetching events %v", q))
 		blockEvents, err := e.gateway.GetEvents(q.Type, q.StartHeight, q.EndHeight)
@@ -132,6 +133,6 @@ func (e *Events) eventWorker(jobChan <-chan client.EventRangeQuery, results chan
 }
 
 type EventWorkerResult struct {
-	Events []client.BlockEvents
+	Events []flow.BlockEvents
 	Error  error
 }


Test patch:
diff --git a/pkg/flowkit/arguments_test.go b/pkg/flowkit/arguments_test.go
index 8f23b1bd..30238dae 100644
--- a/pkg/flowkit/arguments_test.go
+++ b/pkg/flowkit/arguments_test.go
@@ -57,7 +57,7 @@ func TestArguments(t *testing.T) {
 			[]string{sample.String()},
 		)
 		assert.NoError(t, err)
-		assert.Equal(t, 1, len(args))
+		assert.Len(t, args, 1)
 		assert.Equal(t, []cadence.Value{sample}, args)
 	}
 }
diff --git a/pkg/flowkit/config/config_test.go b/pkg/flowkit/config/config_test.go
index 4133aab0..c8f9663c 100644
--- a/pkg/flowkit/config/config_test.go
+++ b/pkg/flowkit/config/config_test.go
@@ -145,8 +145,8 @@ func Test_GetContractsForNetworkComplex(t *testing.T) {
 	market, err := conf.Contracts.ByName("KittyItemsMarket")
 	assert.NoError(t, err)
 
-	assert.Equal(t, kitty.Name, "KittyItems")
-	assert.Equal(t, market.Source, "./cadence/kittyItemsMarket/contracts/KittyItemsMarket.cdc")
+	assert.Equal(t, "KittyItems", kitty.Name)
+	assert.Equal(t, "./cadence/kittyItemsMarket/contracts/KittyItemsMarket.cdc", market.Source)
 }
 
 func Test_GetContractsByNameAndNetworkComplex(t *testing.T) {
@@ -154,19 +154,19 @@ func Test_GetContractsByNameAndNetworkComplex(t *testing.T) {
 	market, err := conf.Contracts.ByNameAndNetwork("KittyItemsMarket", "testnet")
 	assert.NoError(t, err)
 
-	assert.Equal(t, market.Source, "0x123123123")
+	assert.Equal(t, "0x123123123", market.Source)
 }
 
 func Test_GetContractsByNetworkComplex(t *testing.T) {
 	conf := generateComplexConfig()
 	contracts := conf.Contracts.ByNetwork("emulator")
 
-	assert.Equal(t, 5, len(contracts))
-	assert.Equal(t, contracts[0].Name, "NonFungibleToken")
-	assert.Equal(t, contracts[1].Name, "FungibleToken")
-	assert.Equal(t, contracts[2].Name, "Kibble")
-	assert.Equal(t, contracts[3].Name, "KittyItems")
-	assert.Equal(t, contracts[4].Name, "KittyItemsMarket")
+	assert.Len(t, contracts, 5)
+	assert.Equal(t, "NonFungibleToken", contracts[0].Name)
+	assert.Equal(t, "FungibleToken", contracts[1].Name)
+	assert.Equal(t, "Kibble", contracts[2].Name)
+	assert.Equal(t, "KittyItems", contracts[3].Name)
+	assert.Equal(t, "KittyItemsMarket", contracts[4].Name)
 }
 
 func Test_GetAccountByNameComplex(t *testing.T) {
@@ -174,26 +174,29 @@ func Test_GetAccountByNameComplex(t *testing.T) {
 	acc, err := conf.Accounts.ByName("account-4")
 	assert.NoError(t, err)
 
-	assert.Equal(t, acc.Address.String(), "f8d6e0586b0a20c1")
+	assert.Equal(t, "f8d6e0586b0a20c1", acc.Address.String())
 }
 
 func Test_GetDeploymentsByNetworkComplex(t *testing.T) {
 	conf := generateComplexConfig()
 	deployments := conf.Deployments.ByAccountAndNetwork("account-2", "testnet")
 
-	assert.Equal(t, deployments[0].Contracts, []config.ContractDeployment{
-		{Name: "FungibleToken", Args: []cadence.Value{}},
-		{Name: "NonFungibleToken", Args: []cadence.Value{}},
-		{Name: "Kibble", Args: []cadence.Value{}},
-		{Name: "KittyItems", Args: []cadence.Value{}},
-	})
+	assert.Equal(t,
+		[]config.ContractDeployment{
+			{Name: "FungibleToken", Args: []cadence.Value{}},
+			{Name: "NonFungibleToken", Args: []cadence.Value{}},
+			{Name: "Kibble", Args: []cadence.Value{}},
+			{Name: "KittyItems", Args: []cadence.Value{}},
+		},
+		deployments[0].Contracts,
+	)
 }
 
 func Test_GetNetworkByNameComplex(t *testing.T) {
 	conf := generateComplexConfig()
 	network, err := conf.Networks.ByName("emulator")
 	assert.NoError(t, err)
-	assert.Equal(t, network.Host, "127.0.0.1.3569")
+	assert.Equal(t, "127.0.0.1.3569", network.Host)
 
 	network, err = conf.Networks.ByName("testnet")
 	assert.NoError(t, err)
diff --git a/pkg/flowkit/config/json/account_test.go b/pkg/flowkit/config/json/account_test.go
index 062336c9..976a020d 100644
--- a/pkg/flowkit/config/json/account_test.go
+++ b/pkg/flowkit/config/json/account_test.go
@@ -43,11 +43,11 @@ func Test_ConfigAccountKeysSimple(t *testing.T) {
 	assert.NoError(t, err)
 	key := account.Key
 
-	assert.Equal(t, account.Address.String(), "f8d6e0586b0a20c7")
-	assert.Equal(t, key.HashAlgo.String(), "SHA3_256")
-	assert.Equal(t, key.Index, 0)
-	assert.Equal(t, key.SigAlgo.String(), "ECDSA_P256")
-	assert.Equal(t, key.PrivateKey.String(), "0x1fae488ce86422698f1c13468b137d62de488e7e978d7090396f7883a60abdcf")
+	assert.Equal(t, "f8d6e0586b0a20c7", account.Address.String())
+	assert.Equal(t, "SHA3_256", key.HashAlgo.String())
+	assert.Equal(t, 0, key.Index)
+	assert.Equal(t, "ECDSA_P256", key.SigAlgo.String())
+	assert.Equal(t, "0x1fae488ce86422698f1c13468b137d62de488e7e978d7090396f7883a60abdcf", key.PrivateKey.String())
 }
 
 func Test_ConfigAccountKeysAdvancedHex(t *testing.T) {
@@ -75,12 +75,12 @@ func Test_ConfigAccountKeysAdvancedHex(t *testing.T) {
 	assert.NoError(t, err)
 	key := account.Key
 
-	assert.Equal(t, account.Address.String(), "f8d6e0586b0a20c7")
-	assert.Equal(t, key.HashAlgo.String(), "SHA2_256")
-	assert.Equal(t, key.Index, 1)
-	assert.Equal(t, key.SigAlgo.String(), "ECDSA_P256")
-	assert.Equal(t, key.PrivateKey.String(), "0x271cec6bb5221d12713759188166bdfa00079db5789c36b54dcf1d794d8d8cdf")
-	assert.Equal(t, key.ResourceID, "")
+	assert.Equal(t, "f8d6e0586b0a20c7", account.Address.String())
+	assert.Equal(t, "SHA2_256", key.HashAlgo.String())
+	assert.Equal(t, 1, key.Index)
+	assert.Equal(t, "ECDSA_P256", key.SigAlgo.String())
+	assert.Equal(t, "0x271cec6bb5221d12713759188166bdfa00079db5789c36b54dcf1d794d8d8cdf", key.PrivateKey.String())
+	assert.Equal(t, "", key.ResourceID)
 }
 
 func Test_ConfigAccountKeysAdvancedKMS(t *testing.T) {
@@ -108,11 +108,11 @@ func Test_ConfigAccountKeysAdvancedKMS(t *testing.T) {
 	assert.NoError(t, err)
 	key := account.Key
 
-	assert.Equal(t, account.Address.String(), "f8d6e0586b0a20c7")
-	assert.Equal(t, key.HashAlgo.String(), "SHA3_256")
-	assert.Equal(t, key.Index, 1)
-	assert.Equal(t, key.SigAlgo.String(), "ECDSA_P256")
-	assert.Equal(t, key.ResourceID, "projects/flow/locations/us/keyRings/foo/bar/cryptoKeyVersions/1")
+	assert.Equal(t, "f8d6e0586b0a20c7", account.Address.String())
+	assert.Equal(t, "SHA3_256", key.HashAlgo.String())
+	assert.Equal(t, 1, key.Index)
+	assert.Equal(t, "ECDSA_P256", key.SigAlgo.String())
+	assert.Equal(t, "projects/flow/locations/us/keyRings/foo/bar/cryptoKeyVersions/1", key.ResourceID)
 	assert.Nil(t, key.PrivateKey)
 }
 
diff --git a/pkg/flowkit/config/json/config_test.go b/pkg/flowkit/config/json/config_test.go
index d273beb0..b86a1fed 100644
--- a/pkg/flowkit/config/json/config_test.go
+++ b/pkg/flowkit/config/json/config_test.go
@@ -48,7 +48,7 @@ func Test_SimpleJSONConfig(t *testing.T) {
 	conf, err := parser.Deserialize(b)
 
 	assert.NoError(t, err)
-	assert.Equal(t, 1, len(conf.Accounts))
+	assert.Len(t, conf.Accounts, 1)
 	assert.Equal(t, "emulator-account", conf.Accounts[0].Name)
 	assert.Equal(t, "0x11c5dfdeb0ff03a7a73ef39788563b62c89adea67bbb21ab95e5f710bd1d40b7", conf.Accounts[0].Key.PrivateKey.String())
 	network, err := conf.Networks.ByName("emulator")
@@ -80,7 +80,7 @@ func Test_NonExistingContractForDeployment(t *testing.T) {
 	assert.NoError(t, err)
 
 	err = config.Validate()
-	assert.Equal(t, err.Error(), "deployment contains nonexisting contract FungibleToken")
+	assert.Equal(t, "deployment contains nonexisting contract FungibleToken", err.Error())
 }
 
 func Test_NonExistingAccountForDeployment(t *testing.T) {
@@ -109,7 +109,7 @@ func Test_NonExistingAccountForDeployment(t *testing.T) {
 	assert.NoError(t, err)
 
 	err = conf.Validate()
-	assert.Equal(t, err.Error(), "deployment contains nonexisting account test-1")
+	assert.Equal(t, "deployment contains nonexisting account test-1", err.Error())
 }
 
 func Test_NonExistingNetworkForDeployment(t *testing.T) {
@@ -136,7 +136,7 @@ func Test_NonExistingNetworkForDeployment(t *testing.T) {
 	assert.NoError(t, err)
 
 	err = conf.Validate()
-	assert.Equal(t, err.Error(), "deployment contains nonexisting network foo")
+	assert.Equal(t, "deployment contains nonexisting network foo", err.Error())
 }
 
 func Test_NonExistingAccountForEmulator(t *testing.T) {
@@ -154,5 +154,5 @@ func Test_NonExistingAccountForEmulator(t *testing.T) {
 	assert.NoError(t, err)
 
 	err = conf.Validate()
-	assert.Equal(t, err.Error(), "emulator default contains nonexisting service account emulator-account")
+	assert.Equal(t, "emulator default contains nonexisting service account emulator-account", err.Error())
 }
diff --git a/pkg/flowkit/config/json/contract_test.go b/pkg/flowkit/config/json/contract_test.go
index 60e97d5c..bf871f13 100644
--- a/pkg/flowkit/config/json/contract_test.go
+++ b/pkg/flowkit/config/json/contract_test.go
@@ -65,7 +65,7 @@ func Test_ConfigContractsComplex(t *testing.T) {
 	contracts, err := jsonContracts.transformToConfig()
 	assert.NoError(t, err)
 
-	assert.Equal(t, len(contracts), 2)
+	assert.Len(t, contracts, 2)
 
 	contract, err := contracts.ByName("KittyItems")
 	assert.NoError(t, err)
@@ -75,9 +75,9 @@ func Test_ConfigContractsComplex(t *testing.T) {
 	kittyItemsMarketTestnet, err := contracts.ByNameAndNetwork("KittyItemsMarket", "testnet")
 	assert.NoError(t, err)
 
-	assert.Equal(t, contract.Source, "./cadence/kittyItems/contracts/KittyItems.cdc")
-	assert.Equal(t, kittyItemsMarketEmulator.Source, "./cadence/kittyItemsMarket/contracts/KittyItemsMarket.cdc")
-	assert.Equal(t, kittyItemsMarketTestnet.Source, "./cadence/kittyItemsMarket/contracts/KittyItemsMarket.cdc")
+	assert.Equal(t, "./cadence/kittyItems/contracts/KittyItems.cdc", contract.Source)
+	assert.Equal(t, "./cadence/kittyItemsMarket/contracts/KittyItemsMarket.cdc", kittyItemsMarketEmulator.Source)
+	assert.Equal(t, "./cadence/kittyItemsMarket/contracts/KittyItemsMarket.cdc", kittyItemsMarketTestnet.Source)
 
 	kittyItemsEmulator, err := contracts.ByNameAndNetwork("KittyItems", "emulator")
 	assert.NoError(t, err)
@@ -85,11 +85,11 @@ func Test_ConfigContractsComplex(t *testing.T) {
 	kittyItemsTestnet, err := contracts.ByNameAndNetwork("KittyItems", "testnet")
 	assert.NoError(t, err)
 
-	assert.Equal(t, kittyItemsEmulator.Alias, "")
-	assert.Equal(t, kittyItemsTestnet.Alias, "")
+	assert.Equal(t, "", kittyItemsEmulator.Alias)
+	assert.Equal(t, "", kittyItemsTestnet.Alias)
 
-	assert.Equal(t, kittyItemsMarketTestnet.Alias, "f8d6e0586b0a20c7")
-	assert.Equal(t, kittyItemsMarketEmulator.Alias, "")
+	assert.Equal(t, "f8d6e0586b0a20c7", kittyItemsMarketTestnet.Alias)
+	assert.Equal(t, "", kittyItemsMarketEmulator.Alias)
 }
 
 func Test_ConfigContractsAliases(t *testing.T) {
@@ -125,14 +125,14 @@ func Test_ConfigContractsAliases(t *testing.T) {
 	fungibleTokenTestnet, err := contracts.ByNameAndNetwork("FungibleToken", "testnet")
 	assert.NoError(t, err)
 
-	assert.Equal(t, fungibleToken.Network, "emulator")
-	assert.Equal(t, fungibleToken.Alias, "e5a8b7f23e8b548f")
-	assert.Equal(t, fungibleToken.Source, "../hungry-kitties/cadence/contracts/FungibleToken.cdc")
-	assert.Equal(t, fungibleTokenEmulator.Alias, "e5a8b7f23e8b548f")
-	assert.Equal(t, fungibleTokenTestnet.Alias, "")
-	assert.Equal(t, fungibleTokenTestnet.Network, "testnet")
-	assert.Equal(t, fungibleTokenTestnet.Source, "../hungry-kitties/cadence/contracts/FungibleToken.cdc")
-	assert.Equal(t, fungibleTokenEmulator.Source, "../hungry-kitties/cadence/contracts/FungibleToken.cdc")
+	assert.Equal(t, "emulator", fungibleToken.Network)
+	assert.Equal(t, "e5a8b7f23e8b548f", fungibleToken.Alias)
+	assert.Equal(t, "../hungry-kitties/cadence/contracts/FungibleToken.cdc", fungibleToken.Source)
+	assert.Equal(t, "e5a8b7f23e8b548f", fungibleTokenEmulator.Alias)
+	assert.Equal(t, "", fungibleTokenTestnet.Alias)
+	assert.Equal(t, "testnet", fungibleTokenTestnet.Network)
+	assert.Equal(t, "../hungry-kitties/cadence/contracts/FungibleToken.cdc", fungibleTokenTestnet.Source)
+	assert.Equal(t, "../hungry-kitties/cadence/contracts/FungibleToken.cdc", fungibleTokenEmulator.Source)
 
 	kibbleTestnet, err := contracts.ByNameAndNetwork("Kibble", "testnet")
 	assert.NoError(t, err)
diff --git a/pkg/flowkit/config/json/deploy_test.go b/pkg/flowkit/config/json/deploy_test.go
index dc1f0ff9..338ac168 100644
--- a/pkg/flowkit/config/json/deploy_test.go
+++ b/pkg/flowkit/config/json/deploy_test.go
@@ -55,8 +55,8 @@ func Test_ConfigDeploymentsSimple(t *testing.T) {
 	const account2Name = "account-2"
 	const account3Name = "account-3"
 
-	assert.Equal(t, 1, len(deployments.ByNetwork("testnet")))
-	assert.Equal(t, 2, len(deployments.ByNetwork("emulator")))
+	assert.Len(t, deployments.ByNetwork("testnet"), 1)
+	assert.Len(t, deployments.ByNetwork("emulator"), 2)
 
 	account1Deployment := deployments.ByAccountAndNetwork(account1Name, "testnet")
 	account2Deployment := deployments.ByAccountAndNetwork(account2Name, "emulator")
@@ -143,12 +143,12 @@ func Test_DeploymentAdvanced(t *testing.T) {
 	alice := deployments.ByAccountAndNetwork("alice", "emulator")
 	assert.Len(t, alice, 1)
 	assert.Len(t, alice[0].Contracts, 2)
-	assert.Equal(t, alice[0].Contracts[0].Name, "Kibble")
+	assert.Equal(t, "Kibble", alice[0].Contracts[0].Name)
 	assert.Len(t, alice[0].Contracts[0].Args, 3)
-	assert.Equal(t, alice[0].Contracts[0].Args[0].String(), `"Hello World"`)
-	assert.Equal(t, alice[0].Contracts[0].Args[1].String(), "10")
-	assert.Equal(t, alice[0].Contracts[0].Args[2].Type().ID(), "Bool")
+	assert.Equal(t, `"Hello World"`, alice[0].Contracts[0].Args[0].String())
+	assert.Equal(t, "10", alice[0].Contracts[0].Args[1].String())
+	assert.Equal(t, "Bool", alice[0].Contracts[0].Args[2].Type().ID())
 	assert.False(t, alice[0].Contracts[0].Args[2].ToGoValue().(bool))
-	assert.Equal(t, alice[0].Contracts[1].Name, "KittyItemsMarket")
+	assert.Equal(t, "KittyItemsMarket", alice[0].Contracts[1].Name)
 	assert.Len(t, alice[0].Contracts[1].Args, 0)
 }
diff --git a/pkg/flowkit/config/json/emulator_test.go b/pkg/flowkit/config/json/emulator_test.go
index d61faf92..ac3670fc 100644
--- a/pkg/flowkit/config/json/emulator_test.go
+++ b/pkg/flowkit/config/json/emulator_test.go
@@ -39,6 +39,6 @@ func Test_ConfigEmulatorSimple(t *testing.T) {
 	emulators, err := jsonEmulators.transformToConfig()
 	assert.NoError(t, err)
 
-	assert.Equal(t, emulators[0].Name, "default")
-	assert.Equal(t, emulators[0].Port, 9000)
+	assert.Equal(t, "default", emulators[0].Name)
+	assert.Equal(t, 9000, emulators[0].Port)
 }
diff --git a/pkg/flowkit/config/json/network_test.go b/pkg/flowkit/config/json/network_test.go
index 4c54d9f6..6cd24c68 100644
--- a/pkg/flowkit/config/json/network_test.go
+++ b/pkg/flowkit/config/json/network_test.go
@@ -38,8 +38,8 @@ func Test_ConfigNetworkSimple(t *testing.T) {
 
 	network, err := networks.ByName("testnet")
 	assert.NoError(t, err)
-	assert.Equal(t, network.Host, "access.testnet.nodes.onflow.org:9000")
-	assert.Equal(t, network.Name, "testnet")
+	assert.Equal(t, "access.testnet.nodes.onflow.org:9000", network.Host)
+	assert.Equal(t, "testnet", network.Name)
 }
 
 func Test_ConfigNetworkMultiple(t *testing.T) {
@@ -60,14 +60,14 @@ func Test_ConfigNetworkMultiple(t *testing.T) {
 
 	network, err := networks.ByName("testnet")
 	assert.NoError(t, err)
-	assert.Equal(t, network.Host, "access.testnet.nodes.onflow.org:9000")
-	assert.Equal(t, network.Name, "testnet")
-	assert.Equal(t, network.Key, "5000676131ad3e22d853a3f75a5b5d0db4236d08dd6612e2baad771014b5266a242bccecc3522ff7207ac357dbe4f225c709d9b273ac484fed5d13976a39bdcd")
+	assert.Equal(t, "access.testnet.nodes.onflow.org:9000", network.Host)
+	assert.Equal(t, "testnet", network.Name)
+	assert.Equal(t, "5000676131ad3e22d853a3f75a5b5d0db4236d08dd6612e2baad771014b5266a242bccecc3522ff7207ac357dbe4f225c709d9b273ac484fed5d13976a39bdcd", network.Key)
 
 	emulator, err := networks.ByName("emulator")
 	assert.NoError(t, err)
-	assert.Equal(t, emulator.Name, "emulator")
-	assert.Equal(t, emulator.Host, "127.0.0.1:3569")
+	assert.Equal(t, "emulator", emulator.Name)
+	assert.Equal(t, "127.0.0.1:3569", emulator.Host)
 }
 
 func Test_TransformNetworkToJSON(t *testing.T) {
@@ -104,10 +104,10 @@ func Test_IgnoreOldFormat(t *testing.T) {
 	mainnet, err := conf.ByName("mainnet")
 	assert.NoError(t, err)
 
-	assert.Equal(t, testnet.Host, "access.testnet.nodes.onflow.org:9000")
-	assert.Equal(t, testnet.Key, "5000676131ad3e22d853a3f75a5b5d0db4236d08dd6612e2baad771014b5266a242bccecc3522ff7207ac357dbe4f225c709d9b273ac484fed5d13976a39bdcd")
-	assert.Equal(t, mainnet.Host, "access.mainnet.nodes.onflow.org:9000")
-	assert.Equal(t, mainnet.Key, "5000676131ad3e22d853a3f75a5b5d0db4236d08dd6612e2baad771014b5266a242bccecc3522ff7207ac357dbe4f225c709d9b273ac484fed5d13976a39bdcd")
+	assert.Equal(t, "access.testnet.nodes.onflow.org:9000", testnet.Host)
+	assert.Equal(t, "5000676131ad3e22d853a3f75a5b5d0db4236d08dd6612e2baad771014b5266a242bccecc3522ff7207ac357dbe4f225c709d9b273ac484fed5d13976a39bdcd", testnet.Key)
+	assert.Equal(t, "access.mainnet.nodes.onflow.org:9000", mainnet.Host)
+	assert.Equal(t, "5000676131ad3e22d853a3f75a5b5d0db4236d08dd6612e2baad771014b5266a242bccecc3522ff7207ac357dbe4f225c709d9b273ac484fed5d13976a39bdcd", mainnet.Key)
 }
 
 func Test_TransformConfigAdvanced(t *testing.T) {
@@ -122,8 +122,8 @@ func Test_TransformConfigAdvanced(t *testing.T) {
 
 		testnet, err := conf.ByName("testnet")
 		assert.NoError(t, err)
-		assert.Equal(t, testnet.Host, "access.testnet.nodes.onflow.org:9000")
-		assert.Equal(t, testnet.Key, "5000676131ad3e22d853a3f75a5b5d0db4236d08dd6612e2baad771014b5266a242bccecc3522ff7207ac357dbe4f225c709d9b273ac484fed5d13976a39bdcd")
+		assert.Equal(t, "access.testnet.nodes.onflow.org:9000", testnet.Host)
+		assert.Equal(t, "5000676131ad3e22d853a3f75a5b5d0db4236d08dd6612e2baad771014b5266a242bccecc3522ff7207ac357dbe4f225c709d9b273ac484fed5d13976a39bdcd", testnet.Key)
 	})
 	t.Run("should return error if advanced config does not have key", func(t *testing.T) {
 		b := []byte(`{"testnet":{"host":"access.testnet.nodes.onflow.org:9000"}}`)
diff --git a/pkg/flowkit/config/loader_test.go b/pkg/flowkit/config/loader_test.go
index 1486fdf9..f932b926 100644
--- a/pkg/flowkit/config/loader_test.go
+++ b/pkg/flowkit/config/loader_test.go
@@ -61,8 +61,11 @@ func Test_JSONSimple(t *testing.T) {
 	conf, loadErr := composer.Load([]string{"test2-flow.json"})
 
 	assert.NoError(t, loadErr)
-	assert.Equal(t, 1, len(conf.Accounts))
-	assert.Equal(t, "0x21c5dfdeb0ff03a7a73ef39788563b62c89adea67bbb21ab95e5f710bd1d40b7", conf.Accounts[0].Key.PrivateKey.String())
+	assert.Len(t, conf.Accounts, 1)
+	assert.Equal(t,
+		"0x21c5dfdeb0ff03a7a73ef39788563b62c89adea67bbb21ab95e5f710bd1d40b7",
+		conf.Accounts[0].Key.PrivateKey.String(),
+	)
 }
 
 func Test_ErrorWhenMissingBothDefaultJsonFiles(t *testing.T) {
@@ -99,8 +102,9 @@ func Test_AllowMissingLocalJson(t *testing.T) {
 	acc, err := conf.Accounts.ByName("emulator-account")
 	assert.NoError(t, err)
 
-	assert.Equal(t, 1, len(conf.Accounts))
-	assert.Equal(t, "0x21c5dfdeb0ff03a7a73ef39788563b62c89adea67bbb21ab95e5f710bd1d40b7",
+	assert.Len(t, conf.Accounts, 1)
+	assert.Equal(t,
+		"0x21c5dfdeb0ff03a7a73ef39788563b62c89adea67bbb21ab95e5f710bd1d40b7",
 		acc.Key.PrivateKey.String(),
 	)
 }
@@ -142,7 +146,7 @@ func Test_PreferLocalJson(t *testing.T) {
 	assert.NoError(t, err)
 
 	assert.NoError(t, loadErr)
-	assert.Equal(t, 1, len(conf.Accounts))
+	assert.Len(t, conf.Accounts, 1)
 	assert.Equal(t, "0x21c5dfdeb0ff03a7a73ef39788563b62c89adea67bbb21ab95e5f710bd1d40b7",
 		acc.Key.PrivateKey.String(),
 	)
@@ -213,7 +217,7 @@ func Test_ComposeJSON(t *testing.T) {
 	conf, loadErr := composer.Load([]string{"flow.json", "flow-testnet.json"})
 
 	assert.NoError(t, loadErr)
-	assert.Equal(t, 2, len(conf.Accounts))
+	assert.Len(t, conf.Accounts, 2)
 
 	account, err := conf.Accounts.ByName("emulator-account")
 	assert.NoError(t, err)
@@ -304,7 +308,7 @@ func Test_ComposeJSONOverwrite(t *testing.T) {
 	account, err := conf.Accounts.ByName("admin-account")
 	assert.NoError(t, err)
 
-	assert.Equal(t, 1, len(conf.Accounts))
+	assert.Len(t, conf.Accounts, 1)
 	assert.NotNil(t, account)
 	assert.Equal(t, "0x3335dfdeb0ff03a7a73ef39788563b62c89adea67bbb21ab95e5f710bd1d40b7", account.Key.PrivateKey.String())
 }
diff --git a/pkg/flowkit/config/processor_test.go b/pkg/flowkit/config/processor_test.go
index b24f0ef7..4ee25944 100644
--- a/pkg/flowkit/config/processor_test.go
+++ b/pkg/flowkit/config/processor_test.go
@@ -87,7 +87,7 @@ func Test_PrivateConfigFileAccounts(t *testing.T) {
 
 	preprocessor, accFromFile := ProcessorRun(b)
 
-	assert.Equal(t, len(accFromFile), 1)
+	assert.Len(t, accFromFile, 1)
 
 	assert.JSONEq(t, `{
 			"accounts": {
diff --git a/pkg/flowkit/services/accounts_test.go b/pkg/flowkit/services/accounts_test.go
index 3300ed72..4116c67f 100644
--- a/pkg/flowkit/services/accounts_test.go
+++ b/pkg/flowkit/services/accounts_test.go
@@ -65,7 +65,7 @@ func TestAccounts(t *testing.T) {
 
 		gw.Mock.AssertCalled(t, "GetAccount", serviceAddress)
 		assert.NoError(t, err)
-		assert.Equal(t, account.Address, serviceAddress)
+		assert.Equal(t, serviceAddress, account.Address)
 	})
 
 	t.Run("Create an Account", func(t *testing.T) {
@@ -74,8 +74,8 @@ func TestAccounts(t *testing.T) {
 
 		gw.SendSignedTransaction.Run(func(args mock.Arguments) {
 			tx := args.Get(0).(*flowkit.Transaction)
-			assert.Equal(t, tx.FlowTransaction().Authorizers[0], serviceAddress)
-			assert.Equal(t, tx.Signer().Address(), serviceAddress)
+			assert.Equal(t, serviceAddress, tx.FlowTransaction().Authorizers[0])
+			assert.Equal(t, serviceAddress, tx.Signer().Address())
 
 			gw.SendSignedTransaction.Return(tests.NewTransaction(), nil)
 		})
@@ -422,8 +422,8 @@ func TestAccountsCreate_Integration(t *testing.T) {
 
 		errOut := []string{
 			"open Invalid: file does not exist",
-			"invalid account key: signing algorithm (UNKNOWN) is incompatible with hashing algorithm (SHA3_256)",
-			"invalid account key: signing algorithm (UNKNOWN) is incompatible with hashing algorithm (UNKNOWN)",
+			"invalid account key: signing algorithm (UNKNOWN) and hashing algorithm (SHA3_256) are not a valid pair for a Flow account key",
+			"invalid account key: signing algorithm (UNKNOWN) and hashing algorithm (UNKNOWN) are not a valid pair for a Flow account key",
 			"number of keys and weights provided must match, number of provided keys: 2, number of provided key weights: 1",
 			"number of keys and weights provided must match, number of provided keys: 1, number of provided key weights: 2",
 		}
@@ -495,7 +495,7 @@ func TestAccountsCreate_Integration(t *testing.T) {
 
 			assert.Nil(t, acc)
 			assert.Error(t, err)
-			assert.Equal(t, err.Error(), errMsg)
+			assert.Equal(t, errMsg, err.Error())
 		}
 	})
 
diff --git a/pkg/flowkit/services/events_test.go b/pkg/flowkit/services/events_test.go
index 1f432c40..f0c50188 100644
--- a/pkg/flowkit/services/events_test.go
+++ b/pkg/flowkit/services/events_test.go
@@ -23,10 +23,10 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/onflow/flow-go-sdk"
+	"github.com/onflow/flow-go-sdk/access/grpc"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/onflow/flow-go-sdk/client"
-
 	"github.com/onflow/flow-cli/tests"
 )
 
@@ -55,7 +55,7 @@ func TestEvents(t *testing.T) {
 
 		names := []string{"first", "second"}
 		queries := makeEventQueries(names, 0, 400, 250)
-		expected := []client.EventRangeQuery{
+		expected := []grpc.EventRangeQuery{
 			{Type: "first", StartHeight: 0, EndHeight: 249},
 			{Type: "second", StartHeight: 0, EndHeight: 249},
 			{Type: "first", StartHeight: 250, EndHeight: 400},
@@ -69,7 +69,7 @@ func TestEvents(t *testing.T) {
 
 		_, s, gw := setup()
 
-		gw.GetEvents.Return([]client.BlockEvents{}, errors.New("failed getting event"))
+		gw.GetEvents.Return([]flow.BlockEvents{}, errors.New("failed getting event"))
 
 		_, err := s.Events.Get([]string{"flow.CreateAccount"}, 0, 1, 250, 1)
 
diff --git a/pkg/flowkit/services/scripts_test.go b/pkg/flowkit/services/scripts_test.go
index 7ee3bb80..7ddc6b61 100644
--- a/pkg/flowkit/services/scripts_test.go
+++ b/pkg/flowkit/services/scripts_test.go
@@ -36,8 +36,8 @@ func TestScripts(t *testing.T) {
 		_, s, gw := setup()
 
 		gw.ExecuteScript.Run(func(args mock.Arguments) {
-			assert.Equal(t, len(string(args.Get(0).([]byte))), 78)
-			assert.Equal(t, args.Get(1).([]cadence.Value)[0].String(), "\"Foo\"")
+			assert.Len(t, string(args.Get(0).([]byte)), 78)
+			assert.Equal(t, "\"Foo\"", args.Get(1).([]cadence.Value)[0].String())
 			gw.ExecuteScript.Return(cadence.MustConvertValue(""), nil)
 		})
 
@@ -60,7 +60,7 @@ func TestScripts_Integration(t *testing.T) {
 		res, err := s.Scripts.Execute(tests.ScriptArgString.Source, args, "", "")
 
 		assert.NoError(t, err)
-		assert.Equal(t, res.String(), "\"Hello Foo\"")
+		assert.Equal(t, "\"Hello Foo\"", res.String())
 	})
 
 	t.Run("Execute report error", func(t *testing.T) {
diff --git a/pkg/flowkit/services/transactions_test.go b/pkg/flowkit/services/transactions_test.go
index c290da4f..c5b8036a 100644
--- a/pkg/flowkit/services/transactions_test.go
+++ b/pkg/flowkit/services/transactions_test.go
@@ -66,9 +66,9 @@ func TestTransactions(t *testing.T) {
 			tx := args.Get(0).(*flowkit.Transaction)
 			arg, err := tx.FlowTransaction().Argument(0)
 			assert.NoError(t, err)
-			assert.Equal(t, arg.String(), "\"Bar\"")
-			assert.Equal(t, tx.Signer().Address(), serviceAddress)
-			assert.Equal(t, len(string(tx.FlowTransaction().Script)), 227)
+			assert.Equal(t, "\"Bar\"", arg.String())
+			assert.Equal(t, serviceAddress, tx.Signer().Address())
+			assert.Len(t, string(tx.FlowTransaction().Script), 227)
 
 			t := tests.NewTransaction()
 			txID = t.ID()
@@ -76,7 +76,7 @@ func TestTransactions(t *testing.T) {
 		})
 
 		gw.GetTransactionResult.Run(func(args mock.Arguments) {
-			assert.Equal(t, args.Get(0).(*flow.Transaction).ID(), txID)
+			assert.Equal(t, txID, args.Get(0).(*flow.Transaction).ID())
 			gw.GetTransactionResult.Return(tests.NewTransactionResult(nil), nil)
 		})
 
diff --git a/pkg/flowkit/state_test.go b/pkg/flowkit/state_test.go
index 083405f6..8924a7f2 100644
--- a/pkg/flowkit/state_test.go
+++ b/pkg/flowkit/state_test.go
@@ -340,8 +340,8 @@ func Test_GetContractsByNameSimple(t *testing.T) {
 	account, err := p.conf.Accounts.ByName("emulator-account")
 	assert.NoError(t, err)
 	assert.Len(t, contracts, 1)
-	assert.Equal(t, contracts[0].Name, "NonFungibleToken")
-	assert.Equal(t, contracts[0].Source, "../hungry-kitties/cadence/contracts/NonFungibleToken.cdc")
+	assert.Equal(t, "NonFungibleToken", contracts[0].Name)
+	assert.Equal(t, "../hungry-kitties/cadence/contracts/NonFungibleToken.cdc", contracts[0].Source)
 	assert.Equal(t, account.Address, contracts[0].AccountAddress)
 }
 
@@ -349,7 +349,7 @@ func Test_EmulatorConfigSimple(t *testing.T) {
 	p := generateSimpleProject()
 	emulatorServiceAccount, _ := p.EmulatorServiceAccount()
 
-	assert.Equal(t, emulatorServiceAccount.name, "emulator-account")
+	assert.Equal(t, "emulator-account", emulatorServiceAccount.name)
 	assert.Equal(t, emulatorServiceAccount.key.ToConfig().PrivateKey, keys()[0])
 	assert.Equal(t, flow.ServiceAddress("flow-emulator"), emulatorServiceAccount.Address())
 }
@@ -358,7 +358,7 @@ func Test_AccountByAddressSimple(t *testing.T) {
 	p := generateSimpleProject()
 	acc, _ := p.Accounts().ByAddress(flow.ServiceAddress("flow-emulator"))
 
-	assert.Equal(t, acc.name, "emulator-account")
+	assert.Equal(t, "emulator-account", acc.name)
 }
 
 func Test_AccountByNameSimple(t *testing.T) {
@@ -374,7 +374,7 @@ func Test_HostSimple(t *testing.T) {
 	network, err := p.Networks().ByName("emulator")
 
 	assert.NoError(t, err)
-	assert.Equal(t, network.Host, "127.0.0.1.3569")
+	assert.Equal(t, "127.0.0.1.3569", network.Host)
 }
 
 func Test_GetContractsByNameComplex(t *testing.T) {
diff --git a/tests/gateway.go b/tests/gateway.go
index b1323642..44c4aaa8 100644
--- a/tests/gateway.go
+++ b/tests/gateway.go
@@ -21,7 +21,6 @@ package tests
 import (
 	"github.com/onflow/cadence"
 	"github.com/onflow/flow-go-sdk"
-	"github.com/onflow/flow-go-sdk/client"
 	"github.com/stretchr/testify/mock"
 
 	"github.com/onflow/flow-cli/tests/mocks"
@@ -112,7 +111,7 @@ func DefaultMockGateway() *TestGateway {
 	t.GetTransaction.Return(NewTransaction(), nil)
 	t.GetCollection.Return(NewCollection(), nil)
 	t.GetTransactionResult.Return(NewTransactionResult(nil), nil)
-	t.GetEvents.Return([]client.BlockEvents{}, nil)
+	t.GetEvents.Return([]flow.BlockEvents{}, nil)
 	t.GetLatestBlock.Return(NewBlock(), nil)
 	t.GetBlockByHeight.Return(NewBlock(), nil)
 	t.GetBlockByID.Return(NewBlock(), nil)
diff --git a/tests/mocks/Gateway.go b/tests/mocks/Gateway.go
index 2f88ef05..d4e8300a 100644
--- a/tests/mocks/Gateway.go
+++ b/tests/mocks/Gateway.go
@@ -1,16 +1,16 @@
-// Code generated by mockery v1.0.0. DO NOT EDIT.
+// Code generated by mockery v2.12.1. DO NOT EDIT.
 
 package mocks
 
 import (
 	cadence "github.com/onflow/cadence"
-	client "github.com/onflow/flow-go-sdk/client"
-
 	flow "github.com/onflow/flow-go-sdk"
 
 	flowkit "github.com/onflow/flow-cli/pkg/flowkit"
 
 	mock "github.com/stretchr/testify/mock"
+
+	testing "testing"
 )
 
 // Gateway is an autogenerated mock type for the Gateway type
@@ -134,15 +134,15 @@ func (_m *Gateway) GetCollection(_a0 flow.Identifier) (*flow.Collection, error)
 }
 
 // GetEvents provides a mock function with given fields: _a0, _a1, _a2
-func (_m *Gateway) GetEvents(_a0 string, _a1 uint64, _a2 uint64) ([]client.BlockEvents, error) {
+func (_m *Gateway) GetEvents(_a0 string, _a1 uint64, _a2 uint64) ([]flow.BlockEvents, error) {
 	ret := _m.Called(_a0, _a1, _a2)
 
-	var r0 []client.BlockEvents
-	if rf, ok := ret.Get(0).(func(string, uint64, uint64) []client.BlockEvents); ok {
+	var r0 []flow.BlockEvents
+	if rf, ok := ret.Get(0).(func(string, uint64, uint64) []flow.BlockEvents); ok {
 		r0 = rf(_a0, _a1, _a2)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]client.BlockEvents)
+			r0 = ret.Get(0).([]flow.BlockEvents)
 		}
 	}
 
@@ -298,3 +298,13 @@ func (_m *Gateway) SendSignedTransaction(_a0 *flowkit.Transaction) (*flow.Transa
 
 	return r0, r1
 }
+
+// NewGateway creates a new instance of Gateway. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations.
+func NewGateway(t testing.TB) *Gateway {
+	mock := &Gateway{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}