remove all reamining web3

Mintbase · Mar 20, 2024 · 859cea8 · 859cea8
1 parent 352e34d
commit 859cea8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 443 deletions.
diff --git a/examples/mint-nft.ts b/examples/mint-nft.ts
@@ -1,22 +1,13 @@
-import { signAndSendTransaction, web3 } from "../src/chains/ethereum";
+import { ethers } from "ethers";
+import { signAndSendTransaction } from "../src/chains/ethereum";
 import { setupAccount } from "./setup";
 
 const run = async (): Promise<void> => {
   const sender = await setupAccount();
-  const functionSignature = web3.eth.abi.encodeFunctionCall(
-    {
-      name: "safeMint",
-      type: "function",
-      inputs: [
-        {
-          type: "address",
-          name: "to",
-        },
-      ],
-    },
-    ["0xAA5FcF171dDf9FE59c985A28747e650C2e9069cA"]
-  );
-
+  const iface = new ethers.Interface(["function safeMint(address to)"]);
+  const functionSignature = iface.encodeFunctionData("safeMint", [
+    "0xAA5FcF171dDf9FE59c985A28747e650C2e9069cA",
+  ]);
   await signAndSendTransaction(
     sender,
     "0xAA5FcF171dDf9FE59c985A28747e650C2e9069cA",

diff --git a/examples/opensea.ts b/examples/opensea.ts
@@ -1,9 +1,10 @@
 import { OpenSeaSDK, Chain, OrderSide } from "opensea-js";
 import { setupAccount } from "./setup";
-import { provider, signAndSendTransaction } from "../src/chains/ethereum";
+import { signAndSendTransaction } from "../src/chains/ethereum";
 import { openSeaInterface } from "../src/utils/interfaces";
 import { sleep } from "../src/utils/sleep";
 import * as readline from "readline";
+import { provider } from "../src/config";
 
 const rl = readline.createInterface({
   input: process.stdin,

diff --git a/src/chains/ethereum.ts b/src/chains/ethereum.ts
@@ -4,7 +4,6 @@ import { BN } from "bn.js";
 import { ethers } from "ethers";
 import { providers as nearProviders } from "near-api-js";
 import { functionCall } from "near-api-js/lib/transaction";
-import { Bytes } from "web3";
 import {
   deriveChildPublicKey,
   najPublicKeyStrToUncompressedHexPoint,
@@ -117,9 +116,8 @@ export const reconstructSignature = (
 
 export const relayTransaction = async (
   signedTransaction: FeeMarketEIP1559Transaction
-): Promise<Bytes> => {
+): Promise<string> => {
   const serializedTx = bytesToHex(signedTransaction.serialize());
-  // const relayed = await web3.eth.sendSignedTransaction(serializedTx);
   const relayed: ethers.TransactionResponse = await provider.send(
     "eth_sendRawTransaction",
     [serializedTx]