diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 82621f09..995e2849 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.22.0 + go-version: 1.22.1 # - name: Staticheck # run: | diff --git a/app/services/ui/main.go b/app/services/ui/main.go index d8fba633..2f498f38 100644 --- a/app/services/ui/main.go +++ b/app/services/ui/main.go @@ -2,7 +2,6 @@ package main import ( "context" - "embed" "fmt" "net/http" "os" @@ -49,8 +48,8 @@ func main() { } } -//go:embed assets/* -var documents embed.FS +// go:embed assets/* +//var documents embed.FS func show(w http.ResponseWriter, r *http.Request) { // tmpl, err := template.New("").ParseFS(documents, "assets/html/index.html") diff --git a/go.mod b/go.mod index c371866e..c8a007d7 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.0 require ( github.com/ardanlabs/conf/v3 v3.1.7 github.com/ardanlabs/darwin/v3 v3.3.1 - github.com/ardanlabs/ethereum v0.18.1 + github.com/ardanlabs/ethereum v0.19.0 github.com/arl/statsviz v0.6.0 github.com/dimfeld/httptreemux/v5 v5.5.0 github.com/ethereum/go-ethereum v1.13.14 diff --git a/go.sum b/go.sum index f2138db8..8e7460c7 100644 --- a/go.sum +++ b/go.sum @@ -21,8 +21,8 @@ github.com/ardanlabs/conf/v3 v3.1.7 h1:p232cF68TafoA5U9ZlbxUIhGJtGNdKHBXF80Fdqb5 github.com/ardanlabs/conf/v3 v3.1.7/go.mod h1:zclexWKe0NVj6LHQ8NgDDZ7bQ1spE0KeKPFficdtAjU= github.com/ardanlabs/darwin/v3 v3.3.1 h1:tU4nutFgKNH7fFJ98wSj0Zyrsh9a2XltlPz/1AGkIRE= github.com/ardanlabs/darwin/v3 v3.3.1/go.mod h1:dnfiwJYj15gfm/2XltdAmLxhK/7h1eFs7rc4yaaXC0A= -github.com/ardanlabs/ethereum v0.18.1 h1:byUcbDTBeH+wg95QdGwuZ/8/WLwdj/Hg88vwRMQ8z6E= -github.com/ardanlabs/ethereum v0.18.1/go.mod h1:14shCGpZhCHHGyNhidy49bSovQ4bLEGl1L65DiWA1F0= +github.com/ardanlabs/ethereum v0.19.0 h1:KFBwq1b3rF/pdEj3k80yo8S1NebojdXIzw3USESEWNI= +github.com/ardanlabs/ethereum v0.19.0/go.mod h1:9KXq8cG+Ur6JxDyw4xCLZWjumiwyMeODulBcF8BorHg= github.com/arl/statsviz v0.6.0 h1:jbW1QJkEYQkufd//4NDYRSNBpwJNrdzPahF7ZmoGdyE= github.com/arl/statsviz v0.6.0/go.mod h1:0toboo+YGSUXDaS4g1D5TVS4dXs7S7YYT5J/qnW2h8s= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= diff --git a/vendor/github.com/ardanlabs/ethereum/backends.go b/vendor/github.com/ardanlabs/ethereum/backends.go index d776c3fb..460cbd70 100644 --- a/vendor/github.com/ardanlabs/ethereum/backends.go +++ b/vendor/github.com/ardanlabs/ethereum/backends.go @@ -8,7 +8,6 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethclient" @@ -71,7 +70,7 @@ type SimulatedBackend struct { // with the NewSimulation call to get an Ethereum API value. func CreateSimulatedBackend(numAccounts int, autoCommit bool, accountBalance *big.Int) (*SimulatedBackend, error) { keys := make([]*ecdsa.PrivateKey, numAccounts) - alloc := make(core.GenesisAlloc) + alloc := make(types.GenesisAlloc) for i := 0; i < numAccounts; i++ { privateKey, err := ecdsa.GenerateKey(crypto.S256(), rand.Reader) @@ -81,7 +80,7 @@ func CreateSimulatedBackend(numAccounts int, autoCommit bool, accountBalance *bi keys[i] = privateKey - alloc[crypto.PubkeyToAddress(privateKey.PublicKey)] = core.GenesisAccount{ + alloc[crypto.PubkeyToAddress(privateKey.PublicKey)] = types.Account{ Balance: big.NewInt(0).Mul(accountBalance, big.NewInt(1e18)), } } diff --git a/vendor/modules.txt b/vendor/modules.txt index 494b8c57..d1cf4f47 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -28,7 +28,7 @@ github.com/ardanlabs/conf/v3 github.com/ardanlabs/darwin/v3 github.com/ardanlabs/darwin/v3/dialects/postgres github.com/ardanlabs/darwin/v3/drivers/generic -# github.com/ardanlabs/ethereum v0.18.1 +# github.com/ardanlabs/ethereum v0.19.0 ## explicit; go 1.21.6 github.com/ardanlabs/ethereum github.com/ardanlabs/ethereum/currency