Skip to content

Commit

Permalink
bump ethkit to v1.26.1 (#136)
Browse files Browse the repository at this point in the history
  • Loading branch information
attente authored Jun 7, 2024
1 parent 7032a43 commit 018a231
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 227 deletions.
4 changes: 3 additions & 1 deletion core/v1/v1.go
Original file line number Diff line number Diff line change
Expand Up @@ -771,9 +771,11 @@ func (l *signatureTreeDynamicSignatureLeaf) write(writer io.Writer) error {
type WalletConfigSigners []*WalletConfigSigner

func (s WalletConfigSigners) Len() int { return len(s) }

func (s WalletConfigSigners) Less(i, j int) bool {
return s[i].Address.Hash().Big().Cmp(s[j].Address.Hash().Big()) < 0
return s[i].Address.Big().Cmp(s[j].Address.Big()) < 0
}

func (s WalletConfigSigners) Swap(i, j int) { s[i], s[j] = s[j], s[i] }

type WalletConfig struct {
Expand Down
3 changes: 2 additions & 1 deletion core/v2/v2.go
Original file line number Diff line number Diff line change
Expand Up @@ -1771,7 +1771,8 @@ func decodeWalletConfigTreeAddressLeaf(object any) (*WalletConfigTreeAddressLeaf
}

func (l *WalletConfigTreeAddressLeaf) ImageHash() core.ImageHash {
hash := l.Address.Hash()
var hash common.Hash
hash.SetBytes(l.Address.Bytes())
hash[common.HashLength-common.AddressLength-1] = l.Weight
return core.ImageHash{Hash: hash, Preimage: l}
}
Expand Down
2 changes: 1 addition & 1 deletion estimator.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ func (e *Estimator) EstimateCall(ctx context.Context, provider *ethrpc.Provider,
}

from := call.From
if from.Hash().Big().Cmp(common.Big0) == 0 {
if from == (common.Address{}) {
from = stubAddress()
}

Expand Down
61 changes: 16 additions & 45 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ toolchain go1.22.0
// replace github.com/0xsequence/ethkit => /Users/peter/Dev/0xsequence/ethkit

require (
github.com/0xsequence/ethkit v1.25.0
github.com/0xsequence/ethkit v1.26.1
github.com/0xsequence/go-ethauth v0.13.0
github.com/BurntSushi/toml v1.2.1
github.com/davecgh/go-spew v1.1.1
Expand All @@ -19,23 +19,20 @@ require (
)

require (
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/bits-and-blooms/bitset v1.13.0 // indirect
github.com/btcsuite/btcd v0.24.0 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.3 // indirect
github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/deckarep/golang-set v1.8.0 // indirect
github.com/consensys/bavard v0.1.13 // indirect
github.com/consensys/gnark-crypto v0.12.1 // indirect
github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/golang-cz/textcase v1.2.1 // indirect
github.com/google/go-github v17.0.0+incompatible // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/ethereum/c-kzg-4844/bindings/go v0.0.0-20230126171313-363c7d7593b4 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/goware/breaker v0.1.2 // indirect
Expand All @@ -44,49 +41,23 @@ require (
github.com/goware/singleflight v0.2.0 // indirect
github.com/goware/superr v0.0.2 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/huandu/xstrings v1.4.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/holiman/uint256 v1.2.4 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/mmcloughlin/addchain v0.4.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/posener/diff v0.0.1 // indirect
github.com/posener/gitfs v1.2.1 // indirect
github.com/redis/go-redis/v9 v9.5.1 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/src-d/gcfg v1.4.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/supranational/blst v0.3.12 // indirect
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
github.com/webrpc/gen-dart v0.1.1 // indirect
github.com/webrpc/gen-golang v0.14.8 // indirect
github.com/webrpc/gen-javascript v0.12.0 // indirect
github.com/webrpc/gen-kotlin v0.1.0 // indirect
github.com/webrpc/gen-openapi v0.13.0 // indirect
github.com/webrpc/gen-typescript v0.13.0 // indirect
github.com/webrpc/webrpc v0.18.7 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/term v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/tools v0.20.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
gopkg.in/src-d/go-billy.v4 v4.3.1 // indirect
gopkg.in/src-d/go-git.v4 v4.12.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
rsc.io/tmplfunc v0.0.3 // indirect
)
Loading

0 comments on commit 018a231

Please sign in to comment.