fix: resolve colision among dependencies #29

zksync-sdk · Feb 23, 2024 · d7470d9 · d7470d9
1 parent ce8c9fd
commit d7470d9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/accounts/eth_signer.go b/accounts/eth_signer.go
@@ -7,8 +7,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/signer/core/apitypes"
-	"github.com/miguelmota/go-ethereum-hdwallet"
 	"github.com/pkg/errors"
+	"github.com/stephenlacy/go-ethereum-hdwallet"
 	"github.com/zksync-sdk/zksync2-go/eip712"
 )
 

diff --git a/accounts/signer.go b/accounts/signer.go
@@ -7,8 +7,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/signer/core/apitypes"
-	"github.com/miguelmota/go-ethereum-hdwallet"
 	"github.com/pkg/errors"
+	"github.com/stephenlacy/go-ethereum-hdwallet"
 	"github.com/zksync-sdk/zksync2-go/eip712"
 )
 

diff --git a/test/wallet_test.go b/test/wallet_test.go
@@ -17,6 +17,25 @@ import (
 	"testing"
 )
 
+func TestIntegration_NewWalletFromMnemonic(t *testing.T) {
+	const MNEMONIC = "stuff slice staff easily soup parent arm payment cotton trade scatter struggle"
+
+	client, err := clients.Dial(ZkSyncEraProvider)
+	defer client.Close()
+	assert.NoError(t, err, "clients.Dial should not return an error")
+
+	ethClient, err := ethclient.Dial(EthereumProvider)
+	assert.NoError(t, err, "ethclient.Dial should not return an error")
+	defer ethClient.Close()
+
+	chainId, err := client.ChainID(context.Background())
+	assert.NoError(t, err, "ChainID should not return an error")
+
+	wallet, err := accounts.NewWalletFromMnemonic(MNEMONIC, chainId.Int64(), &client, ethClient)
+	assert.NoError(t, err, "NewWalletFromMnemonic should not return an error")
+	assert.NotNil(t, wallet, "Wallet should not be nil")
+}
+
 func TestIntegrationWallet_MainContract(t *testing.T) {
 	client, err := clients.Dial(ZkSyncEraProvider)
 	defer client.Close()