near-safe 0.0.5 → 0.1.0

package/dist/cjs/tx-manager.d.ts

@@ -4,7 +4,6 @@ import { Erc4337Bundler } from "./lib/bundler";
 import { UserOperation, UserOperationReceipt } from "./types";
 import { MetaTransaction } from "ethers-multisend";
 import { ContractSuite } from "./lib/safe";
-import { Account } from "near-api-js";
 export declare class TransactionManager {
     readonly provider: ethers.JsonRpcProvider;
     readonly nearAdapter: NearEthAdapter;
@@ -18,8 +17,7 @@ export declare class TransactionManager {
     static create(config: {
         ethRpc: string;
         erc4337BundlerUrl: string;
-        nearAccount: Account;
-        mpcContractId: string;
+        nearAdapter: NearEthAdapter;
         safeSaltNonce?: string;
     }): Promise<TransactionManager>;
     get safeNotDeployed(): boolean;

package/dist/cjs/tx-manager.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionManager = void 0;
 const ethers_1 = require("ethers");
-const near_ca_1 = require("near-ca");
 const bundler_1 = require("./lib/bundler");
 const util_1 = require("./util");
 const near_1 = require("./lib/near");
@@ -20,20 +19,16 @@ class TransactionManager {
         this._safeNotDeployed = safeNotDeployed;
     }
     static async create(config) {
+        const adapter = config.nearAdapter;
         const provider = new ethers_1.ethers.JsonRpcProvider(config.ethRpc);
-        const [nearAdapter, safePack] = await Promise.all([
-            near_ca_1.NearEthAdapter.fromConfig({
-                mpcContract: new near_ca_1.MpcContract(config.nearAccount, config.mpcContractId),
-            }),
-            safe_1.ContractSuite.init(provider),
-        ]);
-        console.log(`Near Adapter: ${nearAdapter.nearAccountId()} <> ${nearAdapter.address}`);
+        const safePack = await safe_1.ContractSuite.init(provider);
+        console.log(`Near Adapter: ${adapter.nearAccountId()} <> ${adapter.address}`);
         const bundler = new bundler_1.Erc4337Bundler(config.erc4337BundlerUrl, await safePack.entryPoint.getAddress());
-        const setup = await safePack.getSetup([nearAdapter.address]);
+        const setup = await safePack.getSetup([adapter.address]);
         const safeAddress = await safePack.addressForSetup(setup, config.safeSaltNonce);
         const safeNotDeployed = (await provider.getCode(safeAddress)) === "0x";
         console.log(`Safe Address: ${safeAddress} - deployed? ${!safeNotDeployed}`);
-        return new TransactionManager(provider, nearAdapter, safePack, bundler, setup, safeAddress, config.safeSaltNonce || "0", safeNotDeployed);
+        return new TransactionManager(provider, adapter, safePack, bundler, setup, safeAddress, config.safeSaltNonce || "0", safeNotDeployed);
     }
     get safeNotDeployed() {
         return this._safeNotDeployed;

package/dist/esm/tx-manager.d.ts

@@ -4,7 +4,6 @@ import { Erc4337Bundler } from "./lib/bundler";
 import { UserOperation, UserOperationReceipt } from "./types";
 import { MetaTransaction } from "ethers-multisend";
 import { ContractSuite } from "./lib/safe";
-import { Account } from "near-api-js";
 export declare class TransactionManager {
     readonly provider: ethers.JsonRpcProvider;
     readonly nearAdapter: NearEthAdapter;
@@ -18,8 +17,7 @@ export declare class TransactionManager {
     static create(config: {
         ethRpc: string;
         erc4337BundlerUrl: string;
-        nearAccount: Account;
-        mpcContractId: string;
+        nearAdapter: NearEthAdapter;
         safeSaltNonce?: string;
     }): Promise<TransactionManager>;
     get safeNotDeployed(): boolean;

package/dist/esm/tx-manager.js

@@ -1,5 +1,4 @@
 import { ethers } from "ethers";
-import { NearEthAdapter, MpcContract } from "near-ca";
 import { Erc4337Bundler } from "./lib/bundler";
 import { packSignature } from "./util";
 import { getNearSignature } from "./lib/near";
@@ -25,20 +24,16 @@ export class TransactionManager {
         this._safeNotDeployed = safeNotDeployed;
     }
     static async create(config) {
+        const adapter = config.nearAdapter;
         const provider = new ethers.JsonRpcProvider(config.ethRpc);
-        const [nearAdapter, safePack] = await Promise.all([
-            NearEthAdapter.fromConfig({
-                mpcContract: new MpcContract(config.nearAccount, config.mpcContractId),
-            }),
-            ContractSuite.init(provider),
-        ]);
-        console.log(`Near Adapter: ${nearAdapter.nearAccountId()} <> ${nearAdapter.address}`);
+        const safePack = await ContractSuite.init(provider);
+        console.log(`Near Adapter: ${adapter.nearAccountId()} <> ${adapter.address}`);
         const bundler = new Erc4337Bundler(config.erc4337BundlerUrl, await safePack.entryPoint.getAddress());
-        const setup = await safePack.getSetup([nearAdapter.address]);
+        const setup = await safePack.getSetup([adapter.address]);
         const safeAddress = await safePack.addressForSetup(setup, config.safeSaltNonce);
         const safeNotDeployed = (await provider.getCode(safeAddress)) === "0x";
         console.log(`Safe Address: ${safeAddress} - deployed? ${!safeNotDeployed}`);
-        return new TransactionManager(provider, nearAdapter, safePack, bundler, setup, safeAddress, config.safeSaltNonce || "0", safeNotDeployed);
+        return new TransactionManager(provider, adapter, safePack, bundler, setup, safeAddress, config.safeSaltNonce || "0", safeNotDeployed);
     }
     get safeNotDeployed() {
         return this._safeNotDeployed;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "near-safe",
-  "version": "0.0.5",
+  "version": "0.1.0",
   "license": "MIT",
   "description": "An SDK for controlling Ethereum Smart Accounts via ERC4337 from a Near Account.",
   "author": "bh2smith",