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.

Sign up for GitHub

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

Jump to bottom

Update core-contracts version v0.7.7->v0.7.9 #1278

Merged
merged 7 commits into from
Sep 17, 2021
Merged

Update core-contracts version v0.7.7->v0.7.9 #1278

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5beb420
update core-contracts version 0.7.7->0.7.9
jordanschalm Sep 10, 2021
b76ce7c
add new contract contructor argument
jordanschalm Sep 10, 2021
6065342
update state commitments
jordanschalm Sep 10, 2021
3d8aa9b
Merge branch 'master' into jordan/hf/update-core-contracts
jordanschalm Sep 13, 2021
23f8b37
Merge branch 'master' into jordan/hf/update-core-contracts
jordanschalm Sep 17, 2021
19f94e2
Merge branch 'jordan/hf/update-core-contracts' of github.com:onflow/f…
jordanschalm Sep 17, 2021
05adb8f
make tidy
jordanschalm Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion engine/execution/state/bootstrap/bootstrap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func TestBootstrapLedger(t *testing.T) {
}

func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) {
expectedStateCommitmentBytes, _ := hex.DecodeString("4951e30c1c7aa71cb01ce0d744e45c357a6456f10047663da1af997a384b7d51")
expectedStateCommitmentBytes, _ := hex.DecodeString("e8db7461cb4abc886a64ad9ea5f2f1ae2bfeddea91a75a16a7f04ba9dea4ab37")
expectedStateCommitment, err := flow.ToStateCommitment(expectedStateCommitmentBytes)
require.NoError(t, err)

Expand Down
7 changes: 3 additions & 4 deletions fvm/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ func (b *BootstrapProcedure) Run(vm *VirtualMachine, ctx Context, sth *state.Sta

b.deployQC(service)

b.deployIDTableStaking(service, fungibleToken, flowToken)
b.deployIDTableStaking(service, fungibleToken, flowToken, feeContract)

// set the list of nodes which are allowed to stake in this network
b.setStakingAllowlist(service, b.identities.NodeIDs())
Expand Down Expand Up @@ -366,13 +366,12 @@ func (b *BootstrapProcedure) deployQC(service flow.Address) {
panicOnMetaInvokeErrf("failed to deploy QC contract: %s", txError, err)
}

func (b *BootstrapProcedure) deployIDTableStaking(
service, fungibleToken,
flowToken flow.Address) {
func (b *BootstrapProcedure) deployIDTableStaking(service, fungibleToken, flowToken, flowFees flow.Address) {

contract := contracts.FlowIDTableStaking(
fungibleToken.HexWithPrefix(),
flowToken.HexWithPrefix(),
flowFees.HexWithPrefix(),
true)

txError, err := b.vm.invokeMetaTransaction(
Expand Down
17 changes: 11 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ require (
github.com/dgraph-io/badger/v2 v2.0.3
github.com/ef-ds/deque v1.0.4
github.com/ethereum/go-ethereum v1.9.13
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/fxamacker/cbor/v2 v2.2.1-0.20210510192846-c3f3c69e7bc8
github.com/gammazero/workerpool v1.1.2
github.com/gogo/protobuf v1.3.2
Expand Down Expand Up @@ -37,25 +38,26 @@ require (
github.com/libp2p/go-libp2p-transport-upgrader v0.4.6
github.com/libp2p/go-tcp-transport v0.2.7
github.com/m4ksio/wal v1.0.0
github.com/mitchellh/mapstructure v1.3.3 // indirect
github.com/multiformats/go-multiaddr v0.3.3
github.com/multiformats/go-multiaddr-dns v0.3.1
github.com/onflow/cadence v0.19.0
github.com/onflow/flow-core-contracts/lib/go/contracts v0.7.7
github.com/onflow/flow-core-contracts/lib/go/templates v0.7.7
github.com/onflow/flow-core-contracts/lib/go/contracts v0.7.9
github.com/onflow/flow-core-contracts/lib/go/templates v0.7.9
github.com/onflow/flow-emulator v0.20.3
github.com/onflow/flow-go-sdk v0.21.0
github.com/onflow/flow-go/crypto v0.18.0
github.com/onflow/flow/protobuf/go/flow v0.2.2
github.com/opentracing/opentracing-go v1.2.0
github.com/pelletier/go-toml v1.7.0 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.10.0
github.com/psiemens/sconfig v0.1.0 // indirect
github.com/rs/zerolog v1.19.0
github.com/sethvargo/go-retry v0.1.0
github.com/spf13/cobra v1.1.3
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/cobra v1.2.1
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.7.0
github.com/spf13/viper v1.8.1
github.com/stretchr/testify v1.7.0
github.com/uber/jaeger-client-go v2.22.1+incompatible
github.com/uber/jaeger-lib v2.4.0+incompatible // indirect
Expand All @@ -64,10 +66,13 @@ require (
go.uber.org/atomic v1.7.0
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6
golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
google.golang.org/api v0.49.0
google.golang.org/grpc v1.38.0
google.golang.org/protobuf v1.27.1
gopkg.in/ini.v1 v1.63.0 // indirect
gotest.tools v2.2.0+incompatible
pgregory.net/rapid v0.4.7
)
Expand Down