Merge branch 'main' into show-errors

sdk/src/lib/ethereum/bitcoin-depositor.ts

@@ -1,5 +1,7 @@
 import { packRevealDepositParameters } from "@keep-network/tbtc-v2.ts"
 import { BitcoinDepositor as BitcoinDepositorTypechain } from "@acre-btc/contracts/typechain/contracts/BitcoinDepositor"
+import SepoliaBitcoinDepositor from "@acre-btc/contracts/deployments/sepolia/BitcoinDepositor.json"
+
 import {
   ZeroAddress,
   dataSlice,
@@ -24,8 +26,6 @@ import {
 import { Hex } from "../utils"
 import { EthereumNetwork } from "./network"
 
-import SepoliaBitcoinDepositor from "./artifacts/sepolia/BitcoinDepositor.json"
-
 /**
  * Ethereum implementation of the BitcoinDepositor.
  */

sdk/src/lib/ethereum/contract.ts

@@ -1,7 +1,3 @@
-import {
-  EthersContractConfig as _EthersContractConfig,
-  EthersContractDeployment,
-} from "@keep-network/tbtc-v2.ts/dist/src/lib/ethereum/adapter"
 import {
   Contract as EthersContract,
   getAddress,
@@ -10,7 +6,20 @@ import {
 } from "ethers"
 import { EthereumAddress } from "./address"
 
-export { EthersContractDeployment }
+/**
+ * Contract deployment artifact.
+ * @see [hardhat-deploy#Deployment](https://github.com/wighawag/hardhat-deploy/blob/0c969e9a27b4eeff9f5ccac7e19721ef2329eed2/types.ts#L358)}
+ */
+export interface EthersContractDeployment {
+  /**
+   * Address of the deployed contract.
+   */
+  address: string
+  /**
+   * Contract's ABI.
+   */
+  abi: unknown[]
+}
 
 /**
  * Use `VoidSigner` from `ethers` if you want to initialize the Ethereum Acre
@@ -21,10 +30,17 @@ export type EthereumSigner = Signer | VoidSigner
 /**
  * Represents a config set required to connect an Ethereum contract.
  */
-export interface EthersContractConfig
-  // We want to omit the `signerOrProvider` because it points to ethers v5. We
-  // use ethers v6 in Acre SDK.
-  extends Omit<_EthersContractConfig, "signerOrProvider"> {
+export interface EthersContractConfig {
+  /**
+   * Address of the Ethereum contract as a 0x-prefixed hex string.
+   * Optional parameter, if not provided the value will be resolved from the
+   * contract artifact.
+   */
+  address?: string
+  /**
+   * Signer - will return a Contract which will act on behalf of that signer.
+   * The signer will sign all contract transactions.
+   */
   signer: EthereumSigner
 }
 
@@ -37,13 +53,6 @@ export class EthersContractWrapper<T extends EthersContract> {
    */
   protected readonly instance: T
 
-  /**
-   * Number of a block within which the contract was deployed. Value is read
-   * from the contract deployment artifact. It can be overwritten by setting a
-   * {@link EthersContractConfig.deployedAtBlockNumber} property.
-   */
-  protected readonly deployedAtBlockNumber: number
-
   /**
    * Address of this contract instance.
    */
@@ -61,9 +70,6 @@ export class EthersContractWrapper<T extends EthersContract> {
     ) as T
 
     this.#address = contractAddress
-
-    this.deployedAtBlockNumber =
-      config.deployedAtBlockNumber ?? deployment.receipt.blockNumber
   }
 
   /**

sdk/src/lib/ethereum/stbtc.ts

@@ -1,5 +1,6 @@
 import { StBTC as StBTCTypechain } from "@acre-btc/contracts/typechain/contracts/StBTC"
-import stBTC from "./artifacts/sepolia/stBTC.json"
+import stBTC from "@acre-btc/contracts/deployments/sepolia/stBTC.json"
+
 import {
   EthersContractConfig,
   EthersContractDeployment,