Skip to content

Commit 5a28df0

Browse files
authored
Merge branch 'master' into bastian/codeowners
2 parents 4db02e2 + 249cf71 commit 5a28df0

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @sideninja @janezpodhostnik @bluesign @chasefleming @jribbink
1+
* @janezpodhostnik @bluesign @chasefleming @jribbink @peterargue

emulator/blockchain.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ func configureTransactionValidator(conf config, blocks *blocks) (*access.Transac
834834
CheckScriptsParse: true,
835835
MaxTransactionByteSize: flowgo.DefaultMaxTransactionByteSize,
836836
MaxCollectionByteSize: flowgo.DefaultMaxCollectionByteSize,
837-
CheckPayerBalance: false,
837+
CheckPayerBalanceMode: access.Disabled,
838838
},
839839
nil,
840840
)

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/onflow/cadence v1.0.0
1818
github.com/onflow/crypto v0.25.2
1919
github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1
20-
github.com/onflow/flow-go v0.38.0-preview.0.0.20240927175217-79d1fe66e7ea
20+
github.com/onflow/flow-go v0.38.0-preview.0.0.20241001140429-ec4ad1cf1c8a
2121
github.com/onflow/flow-go-sdk v1.0.0
2222
github.com/onflow/flow-nft/lib/go/contracts v1.2.1
2323
github.com/onflow/flow/protobuf/go/flow v0.4.7

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -2059,8 +2059,8 @@ github.com/onflow/flow-ft/lib/go/contracts v1.0.0 h1:mToacZ5NWqtlWwk/7RgIl/jeKB/
20592059
github.com/onflow/flow-ft/lib/go/contracts v1.0.0/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
20602060
github.com/onflow/flow-ft/lib/go/templates v1.0.0 h1:6cMS/lUJJ17HjKBfMO/eh0GGvnpElPgBXx7h5aoWJhs=
20612061
github.com/onflow/flow-ft/lib/go/templates v1.0.0/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
2062-
github.com/onflow/flow-go v0.38.0-preview.0.0.20240927175217-79d1fe66e7ea h1:kgSS/PIKcjonpqgRsed2WevkyXaGX3ABSWwnwLgC7GA=
2063-
github.com/onflow/flow-go v0.38.0-preview.0.0.20240927175217-79d1fe66e7ea/go.mod h1:kdaRKWlvm1vC8Lhf2uI4XvDxS+AvfWvrWZr2CFOz8y8=
2062+
github.com/onflow/flow-go v0.38.0-preview.0.0.20241001140429-ec4ad1cf1c8a h1:WjEBqoO29zWK4gMn41dHOEbA0L0i+u792HdUQGtpdig=
2063+
github.com/onflow/flow-go v0.38.0-preview.0.0.20241001140429-ec4ad1cf1c8a/go.mod h1:kdaRKWlvm1vC8Lhf2uI4XvDxS+AvfWvrWZr2CFOz8y8=
20642064
github.com/onflow/flow-go-sdk v1.0.0-M1/go.mod h1:TDW0MNuCs4SvqYRUzkbRnRmHQL1h4X8wURsCw9P9beo=
20652065
github.com/onflow/flow-go-sdk v1.0.0 h1:Ha4fQm1MMKsyaqMkQLCN3rA/yaQKG6DGwiIfx06j40c=
20662066
github.com/onflow/flow-go-sdk v1.0.0/go.mod h1:iZkW2IWieVUZKK06mQCxpjJzPDgS0VtGpTaP/rKu6J4=

0 commit comments

Comments
 (0)