Merge branch 'master' into webauthn-updates

Author: j1010001

.gitignore

@@ -3,7 +3,6 @@
 /cmd/consensus/consensus
 /cmd/execution/execution
 /cmd/verification/verification
-/cmd/testclient/testclient
 /cmd/util/util
 /cmd/bootstrap/bootstrap
 

Makefile

@@ -238,7 +238,6 @@ tidy:
 	go mod tidy -v
 	cd integration; go mod tidy -v
 	cd crypto; go mod tidy -v
-	cd cmd/testclient; go mod tidy -v
 	cd insecure; go mod tidy -v
 	git diff --exit-code
 

cmd/testclient/README.md

@@ -57,7 +57,7 @@ func TestBootstrapLedger(t *testing.T) {
 }
 
 func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) {
-	expectedStateCommitmentBytes, _ := hex.DecodeString("d663a99bf30646bf3cd770bd19ce96c43f6da658a0928ea67a433beb106fae4f")
+	expectedStateCommitmentBytes, _ := hex.DecodeString("bc3daf8c462869759ffb7ced651d6c6a552a9df7c1268b3b8e6a9804260ab1c6")
 	expectedStateCommitment, err := flow.ToStateCommitment(expectedStateCommitmentBytes)
 	require.NoError(t, err)
 
@@ -104,7 +104,7 @@ func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) {
 // - transaction fee deduction
 // This tests that the state commitment has not changed for the bookkeeping parts of the transaction.
 func TestBootstrapLedger_EmptyTransaction(t *testing.T) {
-	expectedStateCommitmentBytes, _ := hex.DecodeString("231e6e9c2cce27d0a9d2a47f5991ae934ee3eb3336534316c52719f511d46abb")
+	expectedStateCommitmentBytes, _ := hex.DecodeString("85721a09e89b6b3bb5d064fa11da035b9dca4edb6f881c1e9a263da4176b7df8")
 	expectedStateCommitment, err := flow.ToStateCommitment(expectedStateCommitmentBytes)
 	require.NoError(t, err)
 

cmd/testclient/go.mod

@@ -50,8 +50,8 @@ require (
 	github.com/onflow/cadence v1.7.0
 	github.com/onflow/crypto v0.25.3
 	github.com/onflow/flow v0.4.15
-	github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.0
-	github.com/onflow/flow-core-contracts/lib/go/templates v1.8.0
+	github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.1
+	github.com/onflow/flow-core-contracts/lib/go/templates v1.8.1
 	github.com/onflow/flow-go-sdk v1.8.1
 	github.com/onflow/flow/protobuf/go/flow v0.4.15
 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58

cmd/testclient/go.sum

@@ -945,10 +945,10 @@ github.com/onflow/fixed-point v0.1.1 h1:j0jYZVO8VGyk1476alGudEg7XqCkeTVxb5ElRJRK
 github.com/onflow/fixed-point v0.1.1/go.mod h1:gJdoHqKtToKdOZbvryJvDZfcpzC7d2fyWuo3ZmLtcGY=
 github.com/onflow/flow v0.4.15 h1:MdrhULSE5iSYNyLCihH8DI4uab5VciVZUKDFON6zylY=
 github.com/onflow/flow v0.4.15/go.mod h1:lzyAYmbu1HfkZ9cfnL5/sjrrsnJiUU8fRL26CqLP7+c=
-github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.0 h1:Kq6MRKwmHfoTTDty/Ib7is1peaSMBQ2GHcnhDgsRH4c=
-github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.0/go.mod h1:h15J7unHnlTARjudbb0m5KO3EoHIucoBgShAqE6NoNA=
-github.com/onflow/flow-core-contracts/lib/go/templates v1.8.0 h1:vcCIJP8vYuo0t77Hbxh2IEpGSZoEudB58Qpci11LSCE=
-github.com/onflow/flow-core-contracts/lib/go/templates v1.8.0/go.mod h1:twSVyUt3rNrgzAmxtBX+1Gw64QlPemy17cyvnXYy1Ug=
+github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.1 h1:WU0s/4TCiJ+HMMc6RAsmSzPc/O7PecDVbugyHYHEaZQ=
+github.com/onflow/flow-core-contracts/lib/go/contracts v1.8.1/go.mod h1:h15J7unHnlTARjudbb0m5KO3EoHIucoBgShAqE6NoNA=
+github.com/onflow/flow-core-contracts/lib/go/templates v1.8.1 h1:l/sPH4Ki0Td4sB1ybKhVKHFq7ciiUcadV5RULXJl+wE=
+github.com/onflow/flow-core-contracts/lib/go/templates v1.8.1/go.mod h1:twSVyUt3rNrgzAmxtBX+1Gw64QlPemy17cyvnXYy1Ug=
 github.com/onflow/flow-evm-bridge v0.1.0 h1:7X2osvo4NnQgHj8aERUmbYtv9FateX8liotoLnPL9nM=
 github.com/onflow/flow-evm-bridge v0.1.0/go.mod h1:5UYwsnu6WcBNrwitGFxphCl5yq7fbWYGYuiCSTVF6pk=
 github.com/onflow/flow-ft/lib/go/contracts v1.0.1 h1:Ts5ob+CoCY2EjEd0W6vdLJ7hLL3SsEftzXG2JlmSe24=

cmd/testclient/main.go

@@ -31,6 +31,5 @@ tidy:
 	go mod tidy -v
 	cd integration; go mod tidy -v
 	cd crypto; go mod tidy -v
-	cd cmd/testclient; go mod tidy -v
 	cd insecure; go mod tidy -v
 	git diff --exit-code