Skip to content

Commit

Permalink
Add deployment tx hash
Browse files Browse the repository at this point in the history
  • Loading branch information
Diogo Ribeiro committed Mar 16, 2022
1 parent bd5327d commit c0786ea
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 19 deletions.
4 changes: 2 additions & 2 deletions src/extend-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,11 @@ export async function getTransactionUtil(
return txReceipt;
}

export async function getTxReceiptUtil(
export async function getTransactionReceiptUtil(
txHash: string,
hre: HardhatRuntimeEnvironment
): Promise<TransactionReceipt> {
const executed = await hre.starknetWrapper.getTxReceipt({
const executed = await hre.starknetWrapper.getTransactionReceipt({
feederGatewayUrl: hre.config.starknet.networkUrl,
gatewayUrl: hre.config.starknet.networkUrl,
hash: txHash
Expand Down
6 changes: 3 additions & 3 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {
getAccountFromAddressUtil,
getContractFactoryUtil,
getTransactionUtil,
getTxReceiptUtil,
getTransactionReceiptUtil,
getWalletUtil,
shortStringToBigIntUtil
} from "./extend-utils";
Expand Down Expand Up @@ -213,8 +213,8 @@ extendEnvironment((hre) => {
return transaction;
},

getTxReceipt: async (txHash) => {
const txReceipt = await getTxReceiptUtil(txHash, hre);
getTransactionReceipt: async (txHash) => {
const txReceipt = await getTransactionReceiptUtil(txHash, hre);
return txReceipt;
}
};
Expand Down
25 changes: 12 additions & 13 deletions src/starknet-wrappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,7 @@ export abstract class StarknetWrapper {

public abstract invokeOrCall(options: InvokeOrCallWrapperOptions): Promise<ProcessResult>;

protected prepareGetTxQueryOptions(
command: string,
options: TxHashQueryWrapperOptions
): string[] {
protected prepareTxQueryOptions(command: string, options: TxHashQueryWrapperOptions): string[] {
return [
command,
"--hash",
Expand Down Expand Up @@ -181,7 +178,9 @@ export abstract class StarknetWrapper {

public abstract deployAccount(options: DeployAccountWrapperOptions): Promise<ProcessResult>;

public abstract getTxReceipt(options: TxHashQueryWrapperOptions): Promise<ProcessResult>;
public abstract getTransactionReceipt(
options: TxHashQueryWrapperOptions
): Promise<ProcessResult>;

public abstract getTransaction(options: TxHashQueryWrapperOptions): Promise<ProcessResult>;
}
Expand Down Expand Up @@ -317,7 +316,7 @@ export class DockerWrapper extends StarknetWrapper {
networkMode: "host"
};

const preparedOptions = this.prepareGetTxQueryOptions("tx_status", options);
const preparedOptions = this.prepareTxQueryOptions("tx_status", options);

const docker = await this.getDocker();
const executed = await docker.runContainer(
Expand Down Expand Up @@ -350,15 +349,15 @@ export class DockerWrapper extends StarknetWrapper {
return executed;
}

public async getTxReceipt(options: TxHashQueryWrapperOptions): Promise<ProcessResult> {
public async getTransactionReceipt(options: TxHashQueryWrapperOptions): Promise<ProcessResult> {
const binds: String2String = {};

const dockerOptions = {
binds,
networkMode: "host"
};

const preparedOptions = this.prepareGetTxQueryOptions("get_transaction_receipt", options);
const preparedOptions = this.prepareTxQueryOptions("get_transaction_receipt", options);

const docker = await this.getDocker();
const executed = await docker.runContainer(
Expand All @@ -377,7 +376,7 @@ export class DockerWrapper extends StarknetWrapper {
networkMode: "host"
};

const preparedOptions = this.prepareGetTxQueryOptions("get_transaction", options);
const preparedOptions = this.prepareTxQueryOptions("get_transaction", options);

const docker = await this.getDocker();
const executed = await docker.runContainer(
Expand Down Expand Up @@ -455,7 +454,7 @@ export class VenvWrapper extends StarknetWrapper {
}

public async getTxStatus(options: TxHashQueryWrapperOptions): Promise<ProcessResult> {
const preparedOptions = this.prepareGetTxQueryOptions("tx_status", options);
const preparedOptions = this.prepareTxQueryOptions("tx_status", options);
const executed = await this.execute(this.starknetPath, preparedOptions);
return executed;
}
Expand All @@ -466,14 +465,14 @@ export class VenvWrapper extends StarknetWrapper {
return executed;
}

public async getTxReceipt(options: TxHashQueryWrapperOptions): Promise<ProcessResult> {
const preparedOptions = this.prepareGetTxQueryOptions("get_transaction_receipt", options);
public async getTransactionReceipt(options: TxHashQueryWrapperOptions): Promise<ProcessResult> {
const preparedOptions = this.prepareTxQueryOptions("get_transaction_receipt", options);
const executed = await this.execute(this.starknetPath, preparedOptions);
return executed;
}

public async getTransaction(options: TxHashQueryWrapperOptions): Promise<ProcessResult> {
const preparedOptions = this.prepareGetTxQueryOptions("get_transaction", options);
const preparedOptions = this.prepareTxQueryOptions("get_transaction", options);
const executed = await this.execute(this.starknetPath, preparedOptions);
return executed;
}
Expand Down
2 changes: 1 addition & 1 deletion src/type-extensions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ declare module "hardhat/types/runtime" {

getTransaction: (txHash: string) => Promise<Transaction>;

getTxReceipt: (txHash: string) => Promise<TransactionReceipt>;
getTransactionReceipt: (txHash: string) => Promise<TransactionReceipt>;
};
}

Expand Down
2 changes: 2 additions & 0 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ export class StarknetContractFactory {
gatewayUrl: this.gatewayUrl
});
contract.address = address;
contract.deployTxHash = txHash;

return new Promise<StarknetContract>((resolve, reject) => {
iterativelyCheckStatus(
Expand Down Expand Up @@ -363,6 +364,7 @@ export class StarknetContract {
private gatewayUrl: string;
private feederGatewayUrl: string;
private _address: string;
public deployTxHash: string;

constructor(config: StarknetContractConfig) {
this.starknetWrapper = config.starknetWrapper;
Expand Down

0 comments on commit c0786ea

Please sign in to comment.