merge conflicts

ava-labs · Oct 11, 2024 · 6559429 · 6559429
2 parents 11e3061 + bca7739
commit 6559429
Show file tree

Hide file tree

Showing 11 changed files with 351 additions and 265 deletions.
diff --git a/api/jsonrpc/client.go b/api/jsonrpc/client.go
@@ -170,8 +170,8 @@ func (cli *JSONRPCClient) GenerateTransactionManual(
 
 	// Build transaction
 	actionCodec, authCodec := parser.ActionCodec(), parser.AuthCodec()
-	tx := chain.NewTx(base, actions)
-	tx, err := tx.Sign(authFactory, actionCodec, authCodec)
+	unsignedTx := chain.NewTxData(base, actions)
+	tx, err := unsignedTx.Sign(authFactory, actionCodec, authCodec)
 	if err != nil {
 		return nil, nil, fmt.Errorf("%w: failed to sign transaction", err)
 	}

diff --git a/api/jsonrpc/server.go b/api/jsonrpc/server.go
@@ -105,7 +105,7 @@ func (j *JSONRPCServer) SubmitTx(
 	if !rtx.Empty() {
 		return errTransactionExtraBytes
 	}
-	if err := tx.Verify(ctx); err != nil {
+	if err := tx.VerifyAuth(ctx); err != nil {
 		return err
 	}
 	txID := tx.ID()

diff --git a/api/ws/server.go b/api/ws/server.go
@@ -264,7 +264,7 @@ func (w *WebSocketServer) MessageCallback() pubsub.Callback {
 
 			// Verify tx
 			if w.vm.GetVerifyAuth() {
-				if err := tx.Verify(ctx); err != nil {
+				if err := tx.VerifyAuth(ctx); err != nil {
 					w.logger.Error("failed to verify sig",
 						zap.Error(err),
 					)