Revert to SignDeployContractTxParams and SignExecuteScriptTxParams wh…

…en building tx params
alephium · Oct 5, 2024 · 268de9d · 268de9d
1 parent 4286900
commit 268de9d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/packages/web3/src/contract/contract.ts b/packages/web3/src/contract/contract.ts
@@ -41,9 +41,7 @@ import {
   SignExecuteScriptTxParams,
   SignerProvider,
   Address,
-  SignExecuteScriptTxResult,
-  SignDeployContractChainedTxParams,
-  SignExecuteScriptChainedTxParams
+  SignExecuteScriptTxResult
 } from '../signer'
 import * as ralph from './ralph'
 import {
@@ -567,7 +565,7 @@ export class Contract extends Artifact {
   async txParamsForDeployment<P extends Fields>(
     signer: SignerProvider,
     params: DeployContractParams<P>
-  ): Promise<SignDeployContractChainedTxParams> {
+  ): Promise<SignDeployContractTxParams> {
     const isDevnet = await this.isDevnet(signer)
     const initialFields: Fields = params.initialFields ?? {}
     const bytecode = this.buildByteCodeToDeploy(
@@ -576,8 +574,7 @@ export class Contract extends Artifact {
       params.exposePrivateFunctions ?? false
     )
     const selectedAccount = await signer.getSelectedAccount()
-    const signerParams: SignDeployContractChainedTxParams = {
-      type: 'DeployContract',
+    const signerParams: SignDeployContractTxParams = {
       signerAddress: selectedAccount.address,
       signerKeyType: selectedAccount.keyType,
       bytecode: bytecode,
@@ -755,10 +752,9 @@ export class Script extends Artifact {
   async txParamsForExecution<P extends Fields>(
     signer: SignerProvider,
     params: ExecuteScriptParams<P>
-  ): Promise<SignExecuteScriptChainedTxParams> {
+  ): Promise<SignExecuteScriptTxParams> {
     const selectedAccount = await signer.getSelectedAccount()
-    const signerParams: SignExecuteScriptChainedTxParams = {
-      type: 'ExecuteScript',
+    const signerParams: SignExecuteScriptTxParams = {
       signerAddress: selectedAccount.address,
       signerKeyType: selectedAccount.keyType,
       bytecode: this.buildByteCodeToDeploy(params.initialFields ?? {}),

diff --git a/packages/web3/src/signer/signer.ts b/packages/web3/src/signer/signer.ts
@@ -40,9 +40,7 @@ import {
   SubmissionResult,
   SubmitTransactionParams,
   KeyType,
-  MessageHasher,
-  SignChainedTxParams,
-  SignChainedTxResult
+  MessageHasher
 } from './types'
 import { TransactionBuilder } from './tx-builder'
 import { addressFromPublicKey, groupOfAddress } from '../address'

diff --git a/test/transaction.test.ts b/test/transaction.test.ts
@@ -178,7 +178,7 @@ describe('transactions', function () {
     }
 
     const [transferResult, deployResult] = await TransactionBuilder.from(nodeProvider).buildChainedTx(
-      [transferTxParams, deployTxParams],
+      [transferTxParams, { ...deployTxParams, type: 'DeployContract' }],
       [signer1.publicKey, signer2.publicKey]
     )
 
@@ -240,7 +240,7 @@ describe('transactions', function () {
     }
 
     const [transferResult, depositResult] = await TransactionBuilder.from(nodeProvider).buildChainedTx(
-      [transferTxParams, depositTxParams],
+      [transferTxParams, { ...depositTxParams, type: 'ExecuteScript' }],
       [signer1.publicKey, signer2.publicKey]
     )