diff --git a/go.mod b/go.mod index b565fb3c..6a1c87c7 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.21.12 toolchain go1.22.3 require ( - github.com/ava-labs/avalanchego v1.11.11-0.20240814014627-2eef64141457 - github.com/ava-labs/coreth v0.13.8-fixed-genesis-upgrade.0.20240813194342-7635a96aa180 + github.com/ava-labs/avalanchego v1.11.11 + github.com/ava-labs/coreth v0.13.8-fixed-genesis-upgrade.0.20240815193440-a96bc921e732 github.com/ethereum/go-ethereum v1.13.8 github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 github.com/onsi/ginkgo/v2 v2.13.1 diff --git a/go.sum b/go.sum index 5c3ac47c..7e17bad6 100644 --- a/go.sum +++ b/go.sum @@ -56,10 +56,10 @@ github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8= github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/ava-labs/avalanchego v1.11.11-0.20240814014627-2eef64141457 h1:yT27Bn/2+SnJR1YPIscqznSlvpnR3TEGfbS7wdB1Gmg= -github.com/ava-labs/avalanchego v1.11.11-0.20240814014627-2eef64141457/go.mod h1:UkyrRDXK2E15Lq2abyae2Pt+JsWvgsg1pe0/AtoMyAM= -github.com/ava-labs/coreth v0.13.8-fixed-genesis-upgrade.0.20240813194342-7635a96aa180 h1:6aIHp7wbyGVYdhHVQUbG7BEcbCMEQ5SYopPPJyipyvk= -github.com/ava-labs/coreth v0.13.8-fixed-genesis-upgrade.0.20240813194342-7635a96aa180/go.mod h1:/wNBVq7J7wlC2Kbov7kk6LV5xZvau7VF9zwTVOeyAjY= +github.com/ava-labs/avalanchego v1.11.11 h1:MIQq8xRavRj4ZXHA4G+aMiymig7SOScGOG1SApmMvBc= +github.com/ava-labs/avalanchego v1.11.11/go.mod h1:yFx3V31Jy9NFa8GZlgGnwiVf8KGjeF2+Uc99l9Scd/8= +github.com/ava-labs/coreth v0.13.8-fixed-genesis-upgrade.0.20240815193440-a96bc921e732 h1:wlhGJbmb7s3bU2QWtxKjscGjfHknQiq+cVhhUjONsB8= +github.com/ava-labs/coreth v0.13.8-fixed-genesis-upgrade.0.20240815193440-a96bc921e732/go.mod h1:RkQLaQ961Xe/sUb3ycn4Qi18vPPuEetTqDf2eDcquAs= github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= diff --git a/local/blockchain.go b/local/blockchain.go index f10facfa..008e6e63 100644 --- a/local/blockchain.go +++ b/local/blockchain.go @@ -43,6 +43,7 @@ import ( "github.com/ava-labs/avalanchego/wallet/chain/p" pbuilder "github.com/ava-labs/avalanchego/wallet/chain/p/builder" psigner "github.com/ava-labs/avalanchego/wallet/chain/p/signer" + pwallet "github.com/ava-labs/avalanchego/wallet/chain/p/wallet" "github.com/ava-labs/avalanchego/wallet/subnet/primary" "github.com/ava-labs/avalanchego/wallet/subnet/primary/common" "go.uber.org/zap" @@ -826,8 +827,8 @@ func (ln *localNetwork) restartNodes( type wallet struct { addr ids.ShortID pCTX *pbuilder.Context - pWallet p.Wallet - pBackend p.Backend + pWallet pwallet.Wallet + pBackend pwallet.Backend pBuilder pbuilder.Builder pSigner psigner.Signer xCTX *xbuilder.Context @@ -879,10 +880,10 @@ func newWallet( var w wallet w.addr = privateKey.PublicKey().Address() w.pCTX = pCTX - w.pBackend = p.NewBackend(pCTX, pUTXOs, subnetOwners) + w.pBackend = pwallet.NewBackend(pCTX, pUTXOs, subnetOwners) w.pBuilder = pbuilder.New(kc.Addresses(), pCTX, w.pBackend) w.pSigner = psigner.New(kc, w.pBackend) - w.pWallet = p.NewWallet(w.pBuilder, w.pSigner, pClient, w.pBackend) + w.pWallet = pwallet.New(p.NewClient(pClient, w.pBackend), w.pBuilder, w.pSigner) xBackend := x.NewBackend(xCTX, xUTXOs) xBuilder := xbuilder.New(kc.Addresses(), xCTX, xBackend) @@ -895,7 +896,7 @@ func newWallet( func (w *wallet) reload(uri string) { pClient := platformvm.NewClient(uri) - w.pWallet = p.NewWallet(w.pBuilder, w.pSigner, pClient, w.pBackend) + w.pWallet = pwallet.New(p.NewClient(pClient, w.pBackend), w.pBuilder, w.pSigner) } // add all nodes as validators of the primary network, in case they are not diff --git a/local/default/flags.json b/local/default/flags.json index 7a1d3276..afa0dd10 100644 --- a/local/default/flags.json +++ b/local/default/flags.json @@ -4,6 +4,6 @@ "health-check-frequency":"2s", "api-admin-enabled":true, "index-enabled":true, - "log-display-level":"ERROR", - "log-level": "ERROR" + "log-display-level":"INFO", + "log-level": "INFO" } diff --git a/utils/genesis.go b/utils/genesis.go index 73ad4500..7112ef0d 100644 --- a/utils/genesis.go +++ b/utils/genesis.go @@ -26,7 +26,7 @@ const ( func generateCchainGenesis() ([]byte, error) { cChainGenesisMap := map[string]interface{}{} - cChainGenesisMap["config"] = coreth_params.AvalancheLocalChainConfig + cChainGenesisMap["config"] = coreth_params.TestChainConfig cChainGenesisMap["nonce"] = hexa0Str cChainGenesisMap["timestamp"] = hexa0Str cChainGenesisMap["extraData"] = "0x00"