Merge branch 'master' into allow-issue-tx-with-partial-sync

tests/antithesis/avalanchego/main.go

@@ -60,11 +60,13 @@ func main() {
 
 	kc := secp256k1fx.NewKeychain(genesis.EWOQKey)
 	walletSyncStartTime := time.Now()
-	wallet, err := primary.MakeWallet(ctx, &primary.WalletConfig{
-		URI:          c.URIs[0],
-		AVAXKeychain: kc,
-		EthKeychain:  kc,
-	})
+	wallet, err := primary.MakeWallet(
+		ctx,
+		c.URIs[0],
+		kc,
+		kc,
+		primary.WalletConfig{},
+	)
 	require.NoError(err, "failed to initialize wallet")
 	tc.Log().Info("synced wallet",
 		zap.Duration("duration", time.Since(walletSyncStartTime)),
@@ -120,11 +122,13 @@ func main() {
 		uri := c.URIs[i%len(c.URIs)]
 		kc := secp256k1fx.NewKeychain(key)
 		walletSyncStartTime := time.Now()
-		wallet, err := primary.MakeWallet(ctx, &primary.WalletConfig{
-			URI:          uri,
-			AVAXKeychain: kc,
-			EthKeychain:  kc,
-		})
+		wallet, err := primary.MakeWallet(
+			ctx,
+			uri,
+			kc,
+			kc,
+			primary.WalletConfig{},
+		)
 		require.NoError(err, "failed to initialize wallet")
 		tc.Log().Info("synced wallet",
 			zap.Duration("duration", time.Since(walletSyncStartTime)),
@@ -153,7 +157,7 @@ func main() {
 type workload struct {
 	id     int
 	log    logging.Logger
-	wallet primary.Wallet
+	wallet *primary.Wallet
 	addrs  set.Set[ids.ShortID]
 	uris   []string
 }

tests/e2e/x/transfer/virtuous.go

@@ -135,7 +135,7 @@ var _ = e2e.DescribeXChainSerial("[Virtuous Transfer Tx AVAX]", func() {
 				xContext := xBuilder.Context()
 				avaxAssetID := xContext.AVAXAssetID
 
-				wallets := make([]primary.Wallet, len(testKeys))
+				wallets := make([]*primary.Wallet, len(testKeys))
 				shortAddrs := make([]ids.ShortID, len(testKeys))
 				for i := range wallets {
 					shortAddrs[i] = testKeys[i].PublicKey().Address()

tests/fixture/e2e/helpers.go

@@ -61,16 +61,18 @@ func NewPrivateKey(tc tests.TestContext) *secp256k1.PrivateKey {
 }
 
 // Create a new wallet for the provided keychain against the specified node URI.
-func NewWallet(tc tests.TestContext, keychain *secp256k1fx.Keychain, nodeURI tmpnet.NodeURI) primary.Wallet {
+func NewWallet(tc tests.TestContext, keychain *secp256k1fx.Keychain, nodeURI tmpnet.NodeURI) *primary.Wallet {
 	tc.Log().Info("initializing a new wallet",
 		zap.Stringer("nodeID", nodeURI.NodeID),
 		zap.String("URI", nodeURI.URI),
 	)
-	baseWallet, err := primary.MakeWallet(tc.DefaultContext(), &primary.WalletConfig{
-		URI:          nodeURI.URI,
-		AVAXKeychain: keychain,
-		EthKeychain:  keychain,
-	})
+	baseWallet, err := primary.MakeWallet(
+		tc.DefaultContext(),
+		nodeURI.URI,
+		keychain,
+		keychain,
+		primary.WalletConfig{},
+	)
 	require.NoError(tc, err)
 	wallet := primary.NewWalletWithOptions(
 		baseWallet,
@@ -87,12 +89,12 @@ func NewWallet(tc tests.TestContext, keychain *secp256k1fx.Keychain, nodeURI tmp
 }
 
 // OutputWalletBalances outputs the X-Chain and P-Chain balances of the provided wallet.
-func OutputWalletBalances(tc tests.TestContext, wallet primary.Wallet) {
+func OutputWalletBalances(tc tests.TestContext, wallet *primary.Wallet) {
 	_, _ = GetWalletBalances(tc, wallet)
 }
 
 // GetWalletBalances retrieves the X-Chain and P-Chain balances of the provided wallet.
-func GetWalletBalances(tc tests.TestContext, wallet primary.Wallet) (uint64, uint64) {
+func GetWalletBalances(tc tests.TestContext, wallet *primary.Wallet) (uint64, uint64) {
 	require := require.New(tc)
 	var (
 		xWallet  = wallet.X()

tests/fixture/tmpnet/subnet.go

@@ -91,7 +91,7 @@ type Subnet struct {
 }
 
 // Retrieves a wallet configured for use with the subnet
-func (s *Subnet) GetWallet(ctx context.Context, uri string) (primary.Wallet, error) {
+func (s *Subnet) GetWallet(ctx context.Context, uri string) (*primary.Wallet, error) {
 	keychain := secp256k1fx.NewKeychain(s.OwningKey)
 
 	// Only fetch the subnet transaction if a subnet ID is present. This won't be true when
@@ -101,12 +101,15 @@ func (s *Subnet) GetWallet(ctx context.Context, uri string) (primary.Wallet, err
 		subnetIDs = append(subnetIDs, s.SubnetID)
 	}
 
-	return primary.MakeWallet(ctx, &primary.WalletConfig{
-		URI:          uri,
-		AVAXKeychain: keychain,
-		EthKeychain:  keychain,
-		SubnetIDs:    subnetIDs,
-	})
+	return primary.MakeWallet(
+		ctx,
+		uri,
+		keychain,
+		keychain,
+		primary.WalletConfig{
+			SubnetIDs: subnetIDs,
+		},
+	)
 }
 
 // Issues the subnet creation transaction and retains the result. The URI of a node is

vms/example/xsvm/cmd/chain/create/cmd.go

@@ -41,12 +41,15 @@ func createFunc(c *cobra.Command, args []string) error {
 	// NewWalletFromURI fetches the available UTXOs owned by [kc] on the network
 	// that [uri] is hosting.
 	walletSyncStartTime := time.Now()
-	wallet, err := primary.MakeWallet(ctx, &primary.WalletConfig{
-		URI:          config.URI,
-		AVAXKeychain: kc,
-		EthKeychain:  kc,
-		SubnetIDs:    []ids.ID{config.SubnetID},
-	})
+	wallet, err := primary.MakeWallet(
+		ctx,
+		config.URI,
+		kc,
+		kc,
+		primary.WalletConfig{
+			SubnetIDs: []ids.ID{config.SubnetID},
+		},
+	)
 	if err != nil {
 		return err
 	}

vms/platformvm/network/network.go

@@ -29,7 +29,6 @@ type Network struct {
 	*p2p.Network
 
 	log                       logging.Logger
-	txVerifier                TxVerifier
 	mempool                   *gossipMempool
 	partialSyncPrimaryNetwork bool
 	appSender                 common.AppSender
@@ -175,7 +174,6 @@ func New(
 	return &Network{
 		Network:                   p2pNetwork,
 		log:                       log,
-		txVerifier:                txVerifier,
 		mempool:                   gossipMempool,
 		partialSyncPrimaryNetwork: partialSyncPrimaryNetwork,
 		appSender:                 appSender,

wallet/subnet/primary/example_test.go

@@ -27,11 +27,13 @@ func ExampleWallet() {
 	// MakeWallet fetches the available UTXOs owned by [kc] on the network that
 	// [LocalAPIURI] is hosting.
 	walletSyncStartTime := time.Now()
-	wallet, err := MakeWallet(ctx, &WalletConfig{
-		URI:          LocalAPIURI,
-		AVAXKeychain: kc,
-		EthKeychain:  kc,
-	})
+	wallet, err := MakeWallet(
+		ctx,
+		LocalAPIURI,
+		kc,
+		kc,
+		WalletConfig{},
+	)
 	if err != nil {
 		log.Fatalf("failed to initialize wallet with: %s\n", err)
 		return

wallet/subnet/primary/examples/add-permissioned-subnet-validator/main.go

@@ -44,12 +44,15 @@ func main() {
 	// MakeWallet fetches the available UTXOs owned by [kc] on the network that
 	// [uri] is hosting and registers [subnetID].
 	walletSyncStartTime := time.Now()
-	wallet, err := primary.MakeWallet(ctx, &primary.WalletConfig{
-		URI:          uri,
-		AVAXKeychain: kc,
-		EthKeychain:  kc,
-		SubnetIDs:    []ids.ID{subnetID},
-	})
+	wallet, err := primary.MakeWallet(
+		ctx,
+		uri,
+		kc,
+		kc,
+		primary.WalletConfig{
+			SubnetIDs: []ids.ID{subnetID},
+		},
+	)
 	if err != nil {
 		log.Fatalf("failed to initialize wallet: %s\n", err)
 	}

wallet/subnet/primary/examples/add-primary-validator/main.go

@@ -42,11 +42,13 @@ func main() {
 	// MakeWallet fetches the available UTXOs owned by [kc] on the network that
 	// [uri] is hosting.
 	walletSyncStartTime := time.Now()
-	wallet, err := primary.MakeWallet(ctx, &primary.WalletConfig{
-		URI:          uri,
-		AVAXKeychain: kc,
-		EthKeychain:  kc,
-	})
+	wallet, err := primary.MakeWallet(
+		ctx,
+		uri,
+		kc,
+		kc,
+		primary.WalletConfig{},
+	)
 	if err != nil {
 		log.Fatalf("failed to initialize wallet: %s\n", err)
 	}

wallet/subnet/primary/examples/c-chain-export/main.go

@@ -27,11 +27,13 @@ func main() {
 	// MakeWallet fetches the available UTXOs owned by [kc] on the network that
 	// [uri] is hosting.
 	walletSyncStartTime := time.Now()
-	wallet, err := primary.MakeWallet(ctx, &primary.WalletConfig{
-		URI:          uri,
-		AVAXKeychain: kc,
-		EthKeychain:  kc,
-	})
+	wallet, err := primary.MakeWallet(
+		ctx,
+		uri,
+		kc,
+		kc,
+		primary.WalletConfig{},
+	)
 	if err != nil {
 		log.Fatalf("failed to initialize wallet: %s\n", err)
 	}

wallet/subnet/primary/examples/c-chain-import/main.go

@@ -31,11 +31,13 @@ func main() {
 	// MakeWallet fetches the available UTXOs owned by [kc] on the network that
 	// [uri] is hosting.
 	walletSyncStartTime := time.Now()
-	wallet, err := primary.MakeWallet(ctx, &primary.WalletConfig{
-		URI:          uri,
-		AVAXKeychain: kc,
-		EthKeychain:  kc,
-	})
+	wallet, err := primary.MakeWallet(
+		ctx,
+		uri,
+		kc,
+		kc,
+		primary.WalletConfig{},
+	)
 	if err != nil {
 		log.Fatalf("failed to initialize wallet: %s\n", err)
 	}

wallet/subnet/primary/examples/convert-subnet-to-l1/main.go

@@ -63,12 +63,15 @@ func main() {
 	// MakeWallet fetches the available UTXOs owned by [kc] on the network that
 	// [uri] is hosting and registers [subnetID].
 	walletSyncStartTime := time.Now()
-	wallet, err := primary.MakeWallet(ctx, &primary.WalletConfig{
-		URI:          uri,
-		AVAXKeychain: kc,
-		EthKeychain:  kc,
-		SubnetIDs:    []ids.ID{subnetID},
-	})
+	wallet, err := primary.MakeWallet(
+		ctx,
+		uri,
+		kc,
+		kc,
+		primary.WalletConfig{
+			SubnetIDs: []ids.ID{subnetID},
+		},
+	)
 	if err != nil {
 		log.Fatalf("failed to initialize wallet: %s\n", err)
 	}

wallet/subnet/primary/examples/create-asset/main.go

@@ -27,11 +27,13 @@ func main() {
 	// MakeWallet fetches the available UTXOs owned by [kc] on the network that
 	// [uri] is hosting.
 	walletSyncStartTime := time.Now()
-	wallet, err := primary.MakeWallet(ctx, &primary.WalletConfig{
-		URI:          uri,
-		AVAXKeychain: kc,
-		EthKeychain:  kc,
-	})
+	wallet, err := primary.MakeWallet(
+		ctx,
+		uri,
+		kc,
+		kc,
+		primary.WalletConfig{},
+	)
 	if err != nil {
 		log.Fatalf("failed to initialize wallet: %s\n", err)
 	}

wallet/subnet/primary/examples/create-chain/main.go

@@ -50,12 +50,15 @@ func main() {
 	// MakeWallet fetches the available UTXOs owned by [kc] on the network that
 	// [uri] is hosting and registers [subnetID].
 	walletSyncStartTime := time.Now()
-	wallet, err := primary.MakeWallet(ctx, &primary.WalletConfig{
-		URI:          uri,
-		AVAXKeychain: kc,
-		EthKeychain:  kc,
-		SubnetIDs:    []ids.ID{subnetID},
-	})
+	wallet, err := primary.MakeWallet(
+		ctx,
+		uri,
+		kc,
+		kc,
+		primary.WalletConfig{
+			SubnetIDs: []ids.ID{subnetID},
+		},
+	)
 	if err != nil {
 		log.Fatalf("failed to initialize wallet: %s\n", err)
 	}

wallet/subnet/primary/examples/create-locked-stakeable/main.go

@@ -36,11 +36,13 @@ func main() {
 	// MakeWallet fetches the available UTXOs owned by [kc] on the network that
 	// [uri] is hosting.
 	walletSyncStartTime := time.Now()
-	wallet, err := primary.MakeWallet(ctx, &primary.WalletConfig{
-		URI:          uri,
-		AVAXKeychain: kc,
-		EthKeychain:  kc,
-	})
+	wallet, err := primary.MakeWallet(
+		ctx,
+		uri,
+		kc,
+		kc,
+		primary.WalletConfig{},
+	)
 	if err != nil {
 		log.Fatalf("failed to initialize wallet: %s\n", err)
 	}

wallet/subnet/primary/examples/create-subnet/main.go

@@ -25,11 +25,13 @@ func main() {
 	// MakeWallet fetches the available UTXOs owned by [kc] on the network that
 	// [uri] is hosting.
 	walletSyncStartTime := time.Now()
-	wallet, err := primary.MakeWallet(ctx, &primary.WalletConfig{
-		URI:          uri,
-		AVAXKeychain: kc,
-		EthKeychain:  kc,
-	})
+	wallet, err := primary.MakeWallet(
+		ctx,
+		uri,
+		kc,
+		kc,
+		primary.WalletConfig{},
+	)
 	if err != nil {
 		log.Fatalf("failed to initialize wallet: %s\n", err)
 	}

wallet/subnet/primary/examples/disable-l1-validator/main.go

@@ -25,12 +25,15 @@ func main() {
 	// MakeWallet fetches the available UTXOs owned by [kc] on the network that
 	// [uri] is hosting and registers [validationID].
 	walletSyncStartTime := time.Now()
-	wallet, err := primary.MakeWallet(ctx, &primary.WalletConfig{
-		URI:           uri,
-		AVAXKeychain:  kc,
-		EthKeychain:   kc,
-		ValidationIDs: []ids.ID{validationID},
-	})
+	wallet, err := primary.MakeWallet(
+		ctx,
+		uri,
+		kc,
+		kc,
+		primary.WalletConfig{
+			ValidationIDs: []ids.ID{validationID},
+		},
+	)
 	if err != nil {
 		log.Fatalf("failed to initialize wallet: %s\n", err)
 	}