Merge pull request #211 from onflow/janez/upgrade-flow-go-2

devbugging · web-flow · commit b6f46bdb9e38 · 2022-10-10T16:44:40.000+02:00
Upgrade flow-go - change VM calls
diff --git a/blockchain.go b/blockchain.go
@@ -512,7 +512,7 @@ func bootstrapLedger(
 
 	bootstrap := configureBootstrapProcedure(conf, flowAccountKey, conf.GenesisTokenSupply)
 
-	err := vm.Run(ctx, bootstrap, ledger, programs.NewEmptyPrograms())
+	err := vm.Run(ctx, bootstrap, ledger)
 	if err != nil {
 		return err
 	}
@@ -804,7 +804,6 @@ func (b *Blockchain) getAccountAtBlock(address flowgo.Address, blockHeight uint6
 		b.vmCtx,
 		address,
 		b.storage.LedgerViewByHeight(blockHeight),
-		programs.NewEmptyPrograms(),
 	)
 
 	if fvmerrors.IsAccountNotFoundError(err) {
@@ -946,7 +945,7 @@ func (b *Blockchain) executeNextTransaction(ctx fvm.Context) (*types.Transaction
 		) (*fvm.TransactionProcedure, error) {
 			tx := fvm.Transaction(txBody, txIndex)
 
-			err := b.vm.Run(ctx, tx, ledgerView, programs.NewEmptyPrograms())
+			err := b.vm.Run(ctx, tx, ledgerView)
 			if err != nil {
 				return nil, err
 			}
@@ -1023,7 +1022,6 @@ func (b *Blockchain) commitBlock() (*flowgo.Block, error) {
 }
 
 func (b *Blockchain) GetAccountStorage(address sdk.Address) (*AccountStorage, error) {
-	program := programs.NewEmptyPrograms()
 	view := b.pendingBlock.ledgerView.NewChild()
 
 	stateParameters := state.DefaultParameters().
@@ -1053,7 +1051,7 @@ func (b *Blockchain) GetAccountStorage(address sdk.Address) (*AccountStorage, er
 		return nil, err
 	}
 
-	account, err := b.vm.GetAccount(b.vmCtx, flowgo.BytesToAddress(address.Bytes()), view, program)
+	account, err := b.vm.GetAccount(b.vmCtx, flowgo.BytesToAddress(address.Bytes()), view)
 	if err != nil {
 		return nil, err
 	}
@@ -1136,7 +1134,7 @@ func (b *Blockchain) ExecuteScriptAtBlock(script []byte, arguments [][]byte, blo
 
 	scriptProc := fvm.Script(script).WithArguments(arguments...)
 
-	err = b.vm.Run(blockContext, scriptProc, requestedLedgerView, programs.NewEmptyPrograms())
+	err = b.vm.Run(blockContext, scriptProc, requestedLedgerView)
 	if err != nil {
 		return nil, err
 	}
diff --git a/go.mod b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/improbable-eng/grpc-web v0.12.0
 	github.com/logrusorgru/aurora v2.0.3+incompatible
 	github.com/onflow/cadence v0.27.0
-	github.com/onflow/flow-go v0.26.14-test-synchronization.0.20221006152246-65158f882331
+	github.com/onflow/flow-go v0.26.14-test-synchronization.0.20221006164531-ac5e7c1492bc
 	github.com/onflow/flow-go-sdk v0.28.0
 	github.com/onflow/flow-go/crypto v0.24.4
 	github.com/onflow/flow-nft/lib/go/contracts v0.0.0-20220727161549-d59b1e547ac4
diff --git a/go.sum b/go.sum
@@ -569,8 +569,8 @@ github.com/onflow/flow-core-contracts/lib/go/templates v0.11.2-0.20220720151516-
 github.com/onflow/flow-core-contracts/lib/go/templates v0.11.2-0.20220720151516-797b149ceaaa/go.mod h1:JB2hWVxUjhMshUDNVQKfn4dzhhawOO+i3XjlhLMV5MM=
 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.26.14-test-synchronization.0.20221006152246-65158f882331 h1:Y7cZpzadwAl/kYATv+CKWffOT7tu7SrIsK4WCN+pukY=
-github.com/onflow/flow-go v0.26.14-test-synchronization.0.20221006152246-65158f882331/go.mod h1:7A3pt/5AKE8Xk7R0WoflC08VlpHcKAvuA02dprlYoBA=
+github.com/onflow/flow-go v0.26.14-test-synchronization.0.20221006164531-ac5e7c1492bc h1:k0V6aePpiibX+tcsWbUWHKb6IN+dA9N3yy7ipDN4aJQ=
+github.com/onflow/flow-go v0.26.14-test-synchronization.0.20221006164531-ac5e7c1492bc/go.mod h1:7A3pt/5AKE8Xk7R0WoflC08VlpHcKAvuA02dprlYoBA=
 github.com/onflow/flow-go-sdk v0.20.0/go.mod h1:52QZyLwU3p3UZ2FXOy+sRl4JPdtvJoae1spIUBOFxA8=
 github.com/onflow/flow-go-sdk v0.24.0/go.mod h1:IoptMLPyFXWvyd9yYA6/4EmSeeozl6nJoIv4FaEMg74=
 github.com/onflow/flow-go-sdk v0.28.0 h1:MkRKQcqCuHnjSoD7hQKw5WIMbhK9tdhMuEF6FdYivSc=

Original file line number	Diff line number	Diff line change
`@@ -512,7 +512,7 @@ func bootstrapLedger(`
`512`	`512`
`513`	`513`	`bootstrap := configureBootstrapProcedure(conf, flowAccountKey, conf.GenesisTokenSupply)`
`514`	`514`
`515`		`- err := vm.Run(ctx, bootstrap, ledger, programs.NewEmptyPrograms())`
	`515`	`+ err := vm.Run(ctx, bootstrap, ledger)`
`516`	`516`	`if err != nil {`
`517`	`517`	`return err`
`518`	`518`	`}`
`@@ -804,7 +804,6 @@ func (b *Blockchain) getAccountAtBlock(address flowgo.Address, blockHeight uint6`
`804`	`804`	`b.vmCtx,`
`805`	`805`	`address,`
`806`	`806`	`b.storage.LedgerViewByHeight(blockHeight),`
`807`		`- programs.NewEmptyPrograms(),`
`808`	`807`	`)`
`809`	`808`
`810`	`809`	`if fvmerrors.IsAccountNotFoundError(err) {`
`@@ -946,7 +945,7 @@ func (b Blockchain) executeNextTransaction(ctx fvm.Context) (types.Transaction`
`946`	`945`	`) (*fvm.TransactionProcedure, error) {`
`947`	`946`	`tx := fvm.Transaction(txBody, txIndex)`
`948`	`947`
`949`		`- err := b.vm.Run(ctx, tx, ledgerView, programs.NewEmptyPrograms())`
	`948`	`+ err := b.vm.Run(ctx, tx, ledgerView)`
`950`	`949`	`if err != nil {`
`951`	`950`	`return nil, err`
`952`	`951`	`}`
`@@ -1023,7 +1022,6 @@ func (b Blockchain) commitBlock() (flowgo.Block, error) {`
`1023`	`1022`	`}`
`1024`	`1023`
`1025`	`1024`	`func (b Blockchain) GetAccountStorage(address sdk.Address) (AccountStorage, error) {`
`1026`		`- program := programs.NewEmptyPrograms()`
`1027`	`1025`	`view := b.pendingBlock.ledgerView.NewChild()`
`1028`	`1026`
`1029`	`1027`	`stateParameters := state.DefaultParameters().`
`@@ -1053,7 +1051,7 @@ func (b Blockchain) GetAccountStorage(address sdk.Address) (AccountStorage, er`
`1053`	`1051`	`return nil, err`
`1054`	`1052`	`}`
`1055`	`1053`
`1056`		`- account, err := b.vm.GetAccount(b.vmCtx, flowgo.BytesToAddress(address.Bytes()), view, program)`
	`1054`	`+ account, err := b.vm.GetAccount(b.vmCtx, flowgo.BytesToAddress(address.Bytes()), view)`
`1057`	`1055`	`if err != nil {`
`1058`	`1056`	`return nil, err`
`1059`	`1057`	`}`
`@@ -1136,7 +1134,7 @@ func (b *Blockchain) ExecuteScriptAtBlock(script []byte, arguments [][]byte, blo`
`1136`	`1134`
`1137`	`1135`	`scriptProc := fvm.Script(script).WithArguments(arguments...)`
`1138`	`1136`
`1139`		`- err = b.vm.Run(blockContext, scriptProc, requestedLedgerView, programs.NewEmptyPrograms())`
	`1137`	`+ err = b.vm.Run(blockContext, scriptProc, requestedLedgerView)`
`1140`	`1138`	`if err != nil {`
`1141`	`1139`	`return nil, err`
`1142`	`1140`	`}`
-Original file line number
+Diff line change
 	github.com/improbable-eng/grpc-web v0.12.0
 	github.com/logrusorgru/aurora v2.0.3+incompatible
 	github.com/onflow/cadence v0.27.0
 -	github.com/onflow/flow-go v0.26.14-test-synchronization.0.20221006152246-65158f882331
 +	github.com/onflow/flow-go v0.26.14-test-synchronization.0.20221006164531-ac5e7c1492bc
 	github.com/onflow/flow-go-sdk v0.28.0
 	github.com/onflow/flow-go/crypto v0.24.4
 	github.com/onflow/flow-nft/lib/go/contracts v0.0.0-20220727161549-d59b1e547ac4