Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to flow-go v0.38.0-rc.7 #68

Closed
wants to merge 10 commits into from
Closed
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,4 @@ integration-test-cleanup:
rm -rf flow-go

integration-test:
python3 integration_test.py

previewnet-integration-test:
python3 previewnet_integration_test.py
python3 integration_test.py
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ config file:
mode. During offline mode, only certain Rosetta API endpoints are
functional.

* `network: "mainnet" | "testnet" | "previewnet" | "localnet"`
* `network: "mainnet" | "testnet" | "localnet"`

* This defines the specific Flow chain that is being used.

Expand Down
2 changes: 1 addition & 1 deletion access/access.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
libp2ptls "github.com/libp2p/go-libp2p/p2p/security/tls"
"github.com/onflow/cadence"
"github.com/onflow/cadence/common"
jsoncdc "github.com/onflow/cadence/encoding/json"
"github.com/onflow/cadence/runtime/common"
"github.com/onflow/crypto"
"github.com/onflow/flow-go/network/p2p/keyutils"
"github.com/onflow/flow/protobuf/go/flow/access"
Expand Down
1 change: 0 additions & 1 deletion cmd/corecontracts/corecontracts.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ func main() {
for _, network := range []flow.ChainID{
flow.Mainnet,
flow.Testnet,
flow.Previewnet,
flow.Localnet,
flow.Emulator,
} {
Expand Down
1 change: 0 additions & 1 deletion cmd/tipheight/tipheight.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ func main() {
}{
{"mainnet", "access.mainnet.nodes.onflow.org:9000"},
{"testnet", "access.devnet.nodes.onflow.org:9000"},
{"previewnet", "access.previewnet.nodes.onflow.org:9000"},
{"localnet", "127.0.0.1:3569"},
} {
pool := access.New(ctx, []access.NodeConfig{{Address: network.addr}}, nil)
Expand Down
9 changes: 4 additions & 5 deletions cmd/txinfo/txinfo.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@ import (
)

var networks = map[string]string{
"mainnet": "access.mainnet.nodes.onflow.org:9000",
"testnet": "access.devnet.nodes.onflow.org:9000",
"previewnet": "access.previewnet.nodes.onflow.org:9000",
"localnet": "127.0.0.1:3569",
"mainnet": "access.mainnet.nodes.onflow.org:9000",
"testnet": "access.devnet.nodes.onflow.org:9000",
"localnet": "127.0.0.1:3569",
}

func formatTransaction(txn *entities.Transaction) string {
Expand Down Expand Up @@ -72,7 +71,7 @@ func formatTransactionResult(res *flowaccess.TransactionResultResponse) string {

func main() {
if len(os.Args) != 3 {
fmt.Println("Usage: txinfo mainnet|testnet|previewnet <txhash>")
fmt.Println("Usage: txinfo mainnet|testnet <txhash>")
os.Exit(1)
}
addr, ok := networks[os.Args[1]]
Expand Down
2 changes: 1 addition & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ func (c *chainConfig) parseAndValidateNetwork(result *Chain) {
if c.Network == "" {
log.Fatalf("Missing .network value in %s", c.filename)
}
if !(c.Network == "mainnet" || c.Network == "testnet" || c.Network == "previewnet" || c.Network == "localnet" || c.Network == "emulator") {
if !(c.Network == "mainnet" || c.Network == "testnet" || c.Network == "localnet" || c.Network == "emulator") {
log.Fatalf(
"Invalid config value for .network in %s: %q",
c.filename, c.Network,
Expand Down
189 changes: 95 additions & 94 deletions go.mod

Large diffs are not rendered by default.

2,332 changes: 185 additions & 2,147 deletions go.sum

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions model/model.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion model/model.proto
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ enum Network {
UNSPECIFIED_NETWORK = 0;
MAINNET = 1;
TESTNET = 2;
PREVIEWNET = 3;
}

// OperationType specifies the type of an operation within an indexed
Expand Down
3 changes: 1 addition & 2 deletions script/flow.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
"networks": {
"emulator": "127.0.0.1:3569",
"mainnet": "access.mainnet.nodes.onflow.org:9000",
"testnet": "access.devnet.nodes.onflow.org:9000",
"previewnet": "access.previewnet.nodes.onflow.org:9000"
"testnet": "access.devnet.nodes.onflow.org:9000"
},
"accounts": {
"emulator-account": {
Expand Down
2 changes: 1 addition & 1 deletion state/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/onflow/cadence"
"github.com/onflow/cadence/encoding/ccf"
jsoncdc "github.com/onflow/cadence/encoding/json"
_ "github.com/onflow/cadence/runtime/stdlib" // imported for side-effects only
_ "github.com/onflow/cadence/stdlib" // imported for side-effects only
"github.com/onflow/crypto"
"github.com/onflow/crypto/hash"
"github.com/onflow/flow-go/model/fingerprint"
Expand Down
2 changes: 1 addition & 1 deletion state/process.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"time"

"github.com/onflow/cadence"
"github.com/onflow/cadence/runtime/stdlib"
"github.com/onflow/cadence/stdlib"
"github.com/onflow/flow-go/model/flow"
flowaccess "github.com/onflow/flow/protobuf/go/flow/access"
"github.com/onflow/flow/protobuf/go/flow/entities"
Expand Down
Loading