merged

package.json

@@ -58,6 +58,7 @@
     "@ton/ton": "^13.9.0",
     "@vechain/connex-driver": "^2.0.8",
     "@vechain/connex-framework": "^2.0.8",
+    "@vechain/web3-providers-connex": "^1.1.2",
     "@xp/cosmos-client": "git+https://github.com/XP-NETWORK/cosmos-client#bleeding-edge",
     "async-mutex": "^0.5.0",
     "axios": "^1.6.7",
@@ -66,7 +67,7 @@
     "chalk": "4",
     "dotenv": "^16.4.5",
     "elysia": "^1.0.25",
-    "ethers": "^6.11.1",
+    "ethers": "^6.10.0",
     "express": "^4.19.2",
     "fp-ts": "^2.16.6",
     "http-status-codes": "^2.3.0",
@@ -83,7 +84,6 @@
     "tonweb": "^0.0.62",
     "tslog": "^4.9.3",
     "web3-eth-accounts": "^4.1.1",
-    "web3-providers-connex": "^0.3.1",
     "xp-decentralized-sdk": "git+https://github.com/XP-NETWORK/xp-decentralized-client-library#bleeding-edge",
     "zod": "^3.22.4"
   }

src/config.ts

@@ -140,25 +140,25 @@ export const bridgeTestChains = [
     nativeCoinSymbol: "APT",
     network: Network.TESTNET,
   },
-  {
-    chainType: "casper",
-    chain: "CASPER",
-    network: "casper-test",
-    contractAddress:
-      "047ddacdb2d4c44b3d0d6c02341ff96e951409d30d4627d7b580db46743a6111",
-    decimals: 9,
-    intialFund: "1000000000",
-    lastBlock: 4123388,
-    nativeCoinSymbol: "CSPR",
-    rpcURL: "https://rpc.testnet.casperlabs.io",
-  },
+  // {
+  //   chainType: "casper",
+  //   chain: "CASPER",
+  //   network: "casper-test",
+  //   contractAddress:
+  //     "047ddacdb2d4c44b3d0d6c02341ff96e951409d30d4627d7b580db46743a6111",
+  //   decimals: 9,
+  //   intialFund: "1000000000",
+  //   lastBlock: 4123388,
+  //   nativeCoinSymbol: "CSPR",
+  //   rpcURL: "https://rpc.testnet.casperlabs.io",
+  // },
   {
     chain: "VECHAIN",
     rpcURL: "https://sync-testnet.veblocks.net",
-    nativeCoinSymbol: "ETH",
+    nativeCoinSymbol: "VET",
     intialFund: "50000000000000000",
     contractAddress: "0x7111eb5f8d9dA472e9608f2ab3De275C040D60B2",
-    chainType: "evm",
+    chainType: "vechain",
     lastBlock: 20343220,
     decimals: 18,
     blockChunks: 1000,

src/deps/index.ts

@@ -20,6 +20,7 @@ import {
   configTonHandler,
 } from "../handler/chains";
 import { configCasperHandler } from "../handler/chains/casper";
+import { configVechainHandler } from "../handler/chains/evm/config-vechain";
 import type { LogInstance, THandler } from "../handler/types";
 import MikroOrmConfig from "../mikro-orm.config";
 import type { IBridgeConfig, IGeneratedWallets } from "../types";
@@ -180,6 +181,18 @@ export async function configDeps(
       )
     : undefined;
 
+  const vechainConf = config.bridgeChains.find(
+    (e) => e.chainType === "vechain",
+  );
+
+  const vechain = vechainConf
+    ? await configVechainHandler(
+        vechainConf,
+        secrets.evmWallet,
+        ...otherArguments("VECHAIN"),
+      )
+    : undefined;
+
   const casperConf = config.bridgeChains.find((e) => e.chainType === "casper");
 
   const casper = casperConf
@@ -214,6 +227,7 @@ export async function configDeps(
       // Configure Ethereum Virtual Machine (EVM) chains iteratively as they share the same configuration pattern
       ...evmChains,
       ...cosmwasmChains,
+      vechain,
       hedera,
       casper,
       tzHelper,

src/handler/chains/casper/utils/getBalance.ts

@@ -7,12 +7,17 @@ export default async function getBalance(
   signer: Keys.Ed25519,
 ) {
   try {
+    console.log(
+      "casper",
+      signer.publicKey.toHex(),
+      signer.publicKey.toAccountHashStr(),
+    );
     const balance = await useMutexAndRelease(
       fetchProvider,
       async (provider) => {
         return await provider.nodeClient.queryBalance(
-          PurseIdentifier.MainPurseUnderAccountHash,
-          signer.publicKey.toAccountHashStr(),
+          PurseIdentifier.MainPurseUnderPublicKey,
+          signer.publicKey.toHex(),
         );
       },
     );

src/handler/chains/evm/config-hedera.ts

@@ -1,15 +1,14 @@
 import type { EntityManager } from "@mikro-orm/sqlite";
 import { Mutex } from "async-mutex";
 import type { AxiosInstance } from "axios";
-import { type BrowserProvider, JsonRpcProvider, Wallet } from "ethers";
+import { JsonRpcProvider, Wallet } from "ethers";
 import { privateKeyToAccount } from "web3-eth-accounts";
 import type { TSupportedChainTypes, TSupportedChains } from "../../../config";
 import type { BridgeStorage, ERC20Staking } from "../../../contractsTypes/evm";
 import { Block } from "../../../persistence/entities/block";
 import type { IEvmWallet, IHederaChainConfig } from "../../../types";
 import type { LogInstance } from "../../types";
 import { evmHandler } from "./handler";
-import type { MutexReleaser } from "./types";
 
 export async function configHederaHandler(
   conf: IHederaChainConfig,
@@ -27,11 +26,9 @@ export async function configHederaHandler(
   });
   const mutex = new Mutex();
   const provider = new JsonRpcProvider(conf.rpcURL);
-  const fetchProvider = async (): Promise<
-    [JsonRpcProvider | BrowserProvider, MutexReleaser]
-  > => {
+  const fetchProvider = async () => {
     const release = await mutex.acquire();
-    return [provider, release];
+    return [provider, release] as const;
   };
   return evmHandler({
     blockChunks: conf.blockChunks,

src/handler/chains/evm/config-vechain.ts

@@ -0,0 +1,68 @@
+import type { EntityManager } from "@mikro-orm/sqlite";
+import { Driver, SimpleNet, SimpleWallet } from "@vechain/connex-driver";
+import { Framework } from "@vechain/connex-framework";
+import * as thor from "@vechain/web3-providers-connex";
+import { Mutex } from "async-mutex";
+import type { AxiosInstance } from "axios";
+import { BrowserProvider, Wallet } from "ethers";
+import { privateKeyToAccount } from "web3-eth-accounts";
+import type { TSupportedChainTypes, TSupportedChains } from "../../../config";
+import type { BridgeStorage, ERC20Staking } from "../../../contractsTypes/evm";
+import { Block } from "../../../persistence/entities/block";
+import type { IEvmWallet, IVeChainConfig } from "../../../types";
+import type { LogInstance } from "../../types";
+import { evmHandler } from "./handler";
+
+export async function configVechainHandler(
+  conf: IVeChainConfig,
+  wallet: IEvmWallet,
+  storage: BridgeStorage,
+  em: EntityManager,
+  serverLinkHandler: AxiosInstance | undefined,
+  evmLogger: LogInstance,
+  staking: ERC20Staking,
+  _validatorAddress: string,
+) {
+  const lb = await em.findOne(Block, {
+    chain: conf.chain,
+    contractAddress: conf.contractAddress,
+  });
+  const mutex = new Mutex();
+  const net = new SimpleNet(conf.rpcURL);
+  const simpleWalletObj = new SimpleWallet();
+  simpleWalletObj.import(wallet.privateKey);
+  const driver = await Driver.connect(net, simpleWalletObj);
+  const connexObj = new Framework(driver);
+  const provider = thor.ethers.modifyProvider(
+    new BrowserProvider(
+      new thor.Provider({
+        connex: connexObj,
+        net,
+        wallet: simpleWalletObj,
+      }),
+    ),
+  );
+  const fetchProvider = async () => {
+    const release = await mutex.acquire();
+    return [provider, release] as const;
+  };
+  return evmHandler({
+    blockChunks: conf.blockChunks,
+    bridge: conf.contractAddress,
+    chainIdent: conf.chain as TSupportedChains,
+    currency: conf.nativeCoinSymbol,
+    decimals: conf.decimals,
+    em: em.fork(),
+    initialFunds: BigInt(conf.intialFund),
+    lastBlock_: lb?.lastBlock ?? conf.lastBlock,
+    fetchProvider: fetchProvider as never,
+    signer: new Wallet(wallet.privateKey),
+    storage,
+    txSigner: privateKeyToAccount(wallet.privateKey),
+    royaltyProxy: undefined,
+    chainType: conf.chainType as TSupportedChainTypes,
+    serverLinkHandler,
+    logger: evmLogger,
+    staking,
+  });
+}

src/handler/chains/evm/config.ts

@@ -1,18 +1,14 @@
 import type { EntityManager } from "@mikro-orm/sqlite";
-import { Driver, SimpleNet } from "@vechain/connex-driver";
-import { Framework } from "@vechain/connex-framework";
 import { Mutex } from "async-mutex";
 import type { AxiosInstance } from "axios";
-import { BrowserProvider, JsonRpcProvider, Wallet } from "ethers";
+import { JsonRpcProvider, Wallet } from "ethers";
 import { privateKeyToAccount } from "web3-eth-accounts";
-import * as thor from "web3-providers-connex";
 import type { TSupportedChainTypes, TSupportedChains } from "../../../config";
 import type { BridgeStorage, ERC20Staking } from "../../../contractsTypes/evm";
 import { Block } from "../../../persistence/entities/block";
 import type { IEvmChainConfig, IEvmWallet } from "../../../types";
 import type { LogInstance } from "../../types";
 import { evmHandler } from "./handler";
-import type { MutexReleaser } from "./types";
 
 export async function configEvmHandler(
   conf: IEvmChainConfig,
@@ -29,24 +25,10 @@ export async function configEvmHandler(
     contractAddress: conf.contractAddress,
   });
   const mutex = new Mutex();
-  let provider: JsonRpcProvider | BrowserProvider;
-  if (conf.chain === "VECHAIN") {
-    const net = new SimpleNet(conf.rpcURL);
-    const driver = await Driver.connect(net);
-    const connexObj = new Framework(driver);
-    provider = new BrowserProvider(
-      new thor.ConnexProvider({
-        connex: connexObj,
-      }),
-    );
-  } else {
-    provider = new JsonRpcProvider(conf.rpcURL);
-  }
-  const fetchProvider = async (): Promise<
-    [JsonRpcProvider | BrowserProvider, MutexReleaser]
-  > => {
+  const provider = new JsonRpcProvider(conf.rpcURL);
+  const fetchProvider = async () => {
     const release = await mutex.acquire();
-    return [provider, release];
+    return [provider, release] as const;
   };
   return evmHandler({
     blockChunks: conf.blockChunks,

src/handler/chains/evm/handler.ts

@@ -1,3 +1,4 @@
+import type { ContractRunner } from "ethers";
 import { raise } from "xp-decentralized-sdk";
 import { type Bridge, Bridge__factory } from "../../../contractsTypes/evm";
 import pollForLockEvents from "../../poller";
@@ -35,7 +36,13 @@ export function evmHandler({
 }: EVMHandlerParams): THandler {
   const bc = async (): Promise<[Bridge, MutexReleaser]> => {
     const [provider, release] = await fetchProvider();
-    const contract = Bridge__factory.connect(bridge, signer.connect(provider));
+    let runner: ContractRunner;
+    if (chainIdent === "VECHAIN") {
+      runner = await provider.getSigner(signer.address);
+    } else {
+      runner = signer.connect(provider);
+    }
+    const contract = Bridge__factory.connect(bridge, runner);
     return [contract, release];
   };
   return {

src/handler/chains/evm/types/index.ts

@@ -1,6 +1,6 @@
 import type { EntityManager } from "@mikro-orm/sqlite";
 import type { AxiosInstance } from "axios";
-import type { BrowserProvider, JsonRpcProvider, Wallet } from "ethers";
+import type { JsonRpcProvider, Wallet } from "ethers";
 import type { Web3Account } from "web3-eth-accounts";
 import type {
   TSupportedChainTypes,
@@ -35,5 +35,5 @@ export type EVMHandlerParams = {
 export type MutexReleaser = () => void;
 
 export type EVMProviderFetch = () => Promise<
-  [JsonRpcProvider | BrowserProvider, MutexReleaser]
+  readonly [JsonRpcProvider, MutexReleaser]
 >;

src/handler/chains/secrets/utils/listenForLockEvents.ts

@@ -76,6 +76,7 @@ export default async function listenForLockEvents(
             token_amount: tokenAmount, // amount of nfts to be transfered ( 1 in 721 case )
             nft_type: nftType, // Sigular or multiple ( 721 / 1155)
             source_chain: sourceChain, // Source chain of NFT
+            metadata_uri: metadataUri, // Source chain of NFT
           } = parsedLog;
           let convertedTokenId = tokenId;
           if (sourceChain === "SECRET") {
@@ -92,7 +93,7 @@ export default async function listenForLockEvents(
               sourceChain,
               log.transactionHash,
               CHAIN_IDENT,
-              "",
+              metadataUri,
             ),
           );
         }

src/types/index.ts

@@ -120,6 +120,12 @@ type IHederaChainConfig = {
   blockChunks: number;
 } & IChainConfig;
 
+type IVeChainConfig = {
+  chainType: "vechain";
+  rpcURL: string;
+  blockChunks: number;
+} & IChainConfig;
+
 type ISecretChainConfig = {
   chainType: "scrt";
   rpcURL: string;
@@ -197,7 +203,8 @@ type TChain =
   | IICPChainConfig
   | INearChainConfig
   | IAptosChainConfig
-  | ICasperChainConfig;
+  | ICasperChainConfig
+  | IVeChainConfig;
 
 type IBridgeConfig = {
   bridgeChains: TChain[];
@@ -237,4 +244,5 @@ export type {
   TChain,
   ICasperChainConfig,
   ICasperWallet,
+  IVeChainConfig,
 };