diff --git a/.github/workflows/upgrade-typescript-api.yml b/.github/workflows/upgrade-typescript-api.yml
index f6686bb64e..44c835577d 100644
--- a/.github/workflows/upgrade-typescript-api.yml
+++ b/.github/workflows/upgrade-typescript-api.yml
@@ -32,6 +32,7 @@ jobs:
         run: |
           cd moonbeam-types-bundle
           npm install @polkadot/api@latest
+          npm run build
       - name: Upgrade polkadotjs for typescript-api
         run: |
           cd typescript-api
diff --git a/pallets/erc20-xcm-bridge/src/erc20_matcher.rs b/pallets/erc20-xcm-bridge/src/erc20_matcher.rs
index 6bdb26eeb2..799eabd600 100644
--- a/pallets/erc20-xcm-bridge/src/erc20_matcher.rs
+++ b/pallets/erc20-xcm-bridge/src/erc20_matcher.rs
@@ -35,8 +35,7 @@ impl<Erc20MultilocationPrefix: Get<MultiLocation>> MatchesFungibles<H160, U256>
 		};
 		let contract_address = Self::matches_erc20_multilocation(id)
 			.map_err(|_| MatchError::AssetIdConversionFailed)?;
-		let amount =
-			U256::try_from(*amount).map_err(|_| MatchError::AmountToBalanceConversionFailed)?;
+		let amount = U256::from(*amount);
 
 		Ok((contract_address, amount))
 	}
@@ -114,6 +113,28 @@ mod tests {
 		);
 	}
 
+	#[test]
+	fn should_match_valid_erc20_location_with_amount_greater_than_u64() {
+		let location = MultiLocation {
+			parents: 0,
+			interior: Junctions::X2(
+				PalletInstance(42u8),
+				AccountKey20 {
+					key: [0; 20],
+					network: None,
+				},
+			),
+		};
+
+		assert_ok!(
+			Erc20Matcher::<Erc20MultilocationPrefix>::matches_fungibles(&MultiAsset::from((
+				location,
+				100000000000000000u128
+			))),
+			(H160([0; 20]), U256::from(100000000000000000u128))
+		);
+	}
+
 	#[test]
 	fn should_not_match_invalid_erc20_location() {
 		let invalid_location = MultiLocation {
diff --git a/runtime/moonbase/src/governance/referenda.rs b/runtime/moonbase/src/governance/referenda.rs
index a960afda94..abf26ba1d5 100644
--- a/runtime/moonbase/src/governance/referenda.rs
+++ b/runtime/moonbase/src/governance/referenda.rs
@@ -37,7 +37,7 @@ impl pallet_conviction_voting::Config for Runtime {
 	type Polls = Referenda;
 	type MaxTurnout = frame_support::traits::TotalIssuanceOf<Balances, Self::AccountId>;
 	// Maximum number of concurrent votes an account may have
-	type MaxVotes = ConstU32<512>;
+	type MaxVotes = ConstU32<20>;
 	// Minimum period of vote locking
 	type VoteLockingPeriod = VoteLockingPeriod;
 }
diff --git a/runtime/moonbase/src/lib.rs b/runtime/moonbase/src/lib.rs
index 5b0f2780b8..e2bb8988eb 100644
--- a/runtime/moonbase/src/lib.rs
+++ b/runtime/moonbase/src/lib.rs
@@ -179,7 +179,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("moonbase"),
 	impl_name: create_runtime_str!("moonbase"),
 	authoring_version: 4,
-	spec_version: 2500,
+	spec_version: 2403,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 2,
diff --git a/runtime/moonbase/src/xcm_config.rs b/runtime/moonbase/src/xcm_config.rs
index 7b611835a4..ce9e794bed 100644
--- a/runtime/moonbase/src/xcm_config.rs
+++ b/runtime/moonbase/src/xcm_config.rs
@@ -659,7 +659,7 @@ parameter_types! {
 
 	// To be able to support almost all erc20 implementations,
 	// we provide a sufficiently hight gas limit.
-	pub Erc20XcmBridgeTransferGasLimit: u64 = 80_000;
+	pub Erc20XcmBridgeTransferGasLimit: u64 = 200_000;
 }
 
 impl pallet_erc20_xcm_bridge::Config for Runtime {
diff --git a/runtime/moonbeam/src/governance/referenda.rs b/runtime/moonbeam/src/governance/referenda.rs
index b6205deee2..aaf7f9ad12 100644
--- a/runtime/moonbeam/src/governance/referenda.rs
+++ b/runtime/moonbeam/src/governance/referenda.rs
@@ -37,7 +37,7 @@ impl pallet_conviction_voting::Config for Runtime {
 	type Polls = Referenda;
 	type MaxTurnout = frame_support::traits::TotalIssuanceOf<Balances, Self::AccountId>;
 	// Maximum number of concurrent votes an account may have
-	type MaxVotes = ConstU32<512>;
+	type MaxVotes = ConstU32<20>;
 	// Minimum period of vote locking
 	type VoteLockingPeriod = VoteLockingPeriod;
 }
diff --git a/runtime/moonbeam/src/lib.rs b/runtime/moonbeam/src/lib.rs
index e4ac9972ff..60be557b0d 100644
--- a/runtime/moonbeam/src/lib.rs
+++ b/runtime/moonbeam/src/lib.rs
@@ -174,7 +174,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("moonbeam"),
 	impl_name: create_runtime_str!("moonbeam"),
 	authoring_version: 3,
-	spec_version: 2500,
+	spec_version: 2403,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 2,
diff --git a/runtime/moonbeam/src/xcm_config.rs b/runtime/moonbeam/src/xcm_config.rs
index c710f90a1e..9bf8c2e494 100644
--- a/runtime/moonbeam/src/xcm_config.rs
+++ b/runtime/moonbeam/src/xcm_config.rs
@@ -649,7 +649,7 @@ parameter_types! {
 
 	// To be able to support almost all erc20 implementations,
 	// we provide a sufficiently hight gas limit.
-	pub Erc20XcmBridgeTransferGasLimit: u64 = 80_000;
+	pub Erc20XcmBridgeTransferGasLimit: u64 = 200_000;
 }
 
 impl pallet_erc20_xcm_bridge::Config for Runtime {
diff --git a/runtime/moonriver/src/governance/referenda.rs b/runtime/moonriver/src/governance/referenda.rs
index 4b2377513c..3e0df967ba 100644
--- a/runtime/moonriver/src/governance/referenda.rs
+++ b/runtime/moonriver/src/governance/referenda.rs
@@ -37,7 +37,7 @@ impl pallet_conviction_voting::Config for Runtime {
 	type Polls = Referenda;
 	type MaxTurnout = frame_support::traits::TotalIssuanceOf<Balances, Self::AccountId>;
 	// Maximum number of concurrent votes an account may have
-	type MaxVotes = ConstU32<512>;
+	type MaxVotes = ConstU32<20>;
 	// Minimum period of vote locking
 	type VoteLockingPeriod = VoteLockingPeriod;
 }
diff --git a/runtime/moonriver/src/lib.rs b/runtime/moonriver/src/lib.rs
index d7bba0ff80..e2c0e6ea8d 100644
--- a/runtime/moonriver/src/lib.rs
+++ b/runtime/moonriver/src/lib.rs
@@ -175,7 +175,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("moonriver"),
 	impl_name: create_runtime_str!("moonriver"),
 	authoring_version: 3,
-	spec_version: 2500,
+	spec_version: 2403,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 2,
diff --git a/runtime/moonriver/src/xcm_config.rs b/runtime/moonriver/src/xcm_config.rs
index 7b560343ee..4767b865a3 100644
--- a/runtime/moonriver/src/xcm_config.rs
+++ b/runtime/moonriver/src/xcm_config.rs
@@ -661,7 +661,7 @@ parameter_types! {
 
 	// To be able to support almost all erc20 implementations,
 	// we provide a sufficiently hight gas limit.
-	pub Erc20XcmBridgeTransferGasLimit: u64 = 80_000;
+	pub Erc20XcmBridgeTransferGasLimit: u64 = 200_000;
 }
 
 impl pallet_erc20_xcm_bridge::Config for Runtime {
diff --git a/test/README.md b/test/README.md
index 62e0e85d49..f0e8107242 100644
--- a/test/README.md
+++ b/test/README.md
@@ -57,7 +57,7 @@ pnpm moonwall run dev_moonbase
 ```
 
 ```
-pnpm moonwall download moonriver-runtime 2201
+pnpm moonwall download moonriver-runtime 2401
 ```
 
 
diff --git a/tests/tests/test-precompile/test-precompile-wormhole.ts b/tests/tests/test-precompile/test-precompile-wormhole.ts
index 729edbc0c3..51d1414c18 100644
--- a/tests/tests/test-precompile/test-precompile-wormhole.ts
+++ b/tests/tests/test-precompile/test-precompile-wormhole.ts
@@ -290,7 +290,7 @@ describeDevMoonbeam(`Test local Wormhole`, (context) => {
     const result = await context.createBlock(
       createTransaction(context, {
         to: PRECOMPILE_GMP_ADDRESS,
-        gas: 500_000,
+        gas: 600_000,
         data,
       })
     );
diff --git a/typescript-api/package-lock.json b/typescript-api/package-lock.json
index 02904e3482..86dfd97bc8 100644
--- a/typescript-api/package-lock.json
+++ b/typescript-api/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@moonbeam-network/api-augment",
-  "version": "0.2400.0",
+  "version": "0.2401.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@moonbeam-network/api-augment",
-      "version": "0.2400.0",
+      "version": "0.2401.0",
       "license": "GPL-3.0-only",
       "devDependencies": {
         "@polkadot/api": "^10.9.1",
diff --git a/typescript-api/package.json b/typescript-api/package.json
index 1cc6c9c096..68d99e678a 100644
--- a/typescript-api/package.json
+++ b/typescript-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@moonbeam-network/api-augment",
-  "version": "0.2400.0",
+  "version": "0.2401.0",
   "type": "module",
   "private": true,
   "description": "Moonbeam types augment for @polkadot/api",
diff --git a/typescript-api/scripts/generate-local-types.sh b/typescript-api/scripts/generate-local-types.sh
index df8692af47..fb21e6f3b0 100755
--- a/typescript-api/scripts/generate-local-types.sh
+++ b/typescript-api/scripts/generate-local-types.sh
@@ -14,7 +14,7 @@ echo "Installing Packages"
 npm ci
 
 echo "Starting moonbeam node"
-../target/release/moonbeam --tmp --chain=moonbase-local --rpc-port=9933 &> /tmp/node-start.log &
+../target/release/moonbeam --tmp --chain=moonbase-local &> /tmp/node-start.log &
 PID=$!
 
 echo "Waiting node...(5s)"
diff --git a/typescript-api/scripts/runtime-upgrade.sh b/typescript-api/scripts/runtime-upgrade.sh
index 144b056c04..2dc834aee3 100755
--- a/typescript-api/scripts/runtime-upgrade.sh
+++ b/typescript-api/scripts/runtime-upgrade.sh
@@ -26,12 +26,12 @@ npm install
 # Get runtimes metadata
 for CHAIN in ${CHAINS[@]}; do
   echo "Starting $CHAIN node"
-  ../build/moonbeam --no-hardware-benchmarks --no-telemetry --no-prometheus --alice --tmp --chain=$CHAIN-dev --wasm-execution=interpreted-i-know-what-i-do --rpc-port=9933 &> /tmp/node-$CHAIN-start.log &
+  ../build/moonbeam --no-hardware-benchmarks --no-telemetry --no-prometheus --alice --tmp --chain=$CHAIN-dev --wasm-execution=interpreted-i-know-what-i-do &> /tmp/node-$CHAIN-start.log &
   PID=$!
   echo "Waiting node..."
   ( tail -f -n0 /tmp/node-$CHAIN-start.log & ) | grep -q 'Running JSON-RPC HTTP server'
   echo "Getting $CHAIN metadata"
-  curl -s -H "Content-Type: application/json" -d '{"id":"1", "jsonrpc":"2.0", "method": "state_getMetadata", "params":[]}' http://localhost:9933 > metadata-$CHAIN.json
+  curl -s -H "Content-Type: application/json" -d '{"id":"1", "jsonrpc":"2.0", "method": "state_getMetadata", "params":[]}' http://localhost:9944 > metadata-$CHAIN.json
   kill $PID
   sleep 5
 done
diff --git a/typescript-api/src/moonbase/interfaces/augment-api-runtime.ts b/typescript-api/src/moonbase/interfaces/augment-api-runtime.ts
index bec563709c..86c3b96bde 100644
--- a/typescript-api/src/moonbase/interfaces/augment-api-runtime.ts
+++ b/typescript-api/src/moonbase/interfaces/augment-api-runtime.ts
@@ -6,30 +6,12 @@
 import "@polkadot/api-base/types/calls";
 
 import type { ApiTypes, AugmentedCall, DecoratedCallBase } from "@polkadot/api-base/types";
-import type {
-  Bytes,
-  Null,
-  Option,
-  Result,
-  U256,
-  Vec,
-  bool,
-  u256,
-  u32,
-  u64,
-} from "@polkadot/types-codec";
+import type { Bytes, Null, Option, Result, Vec, bool, u32 } from "@polkadot/types-codec";
 import type { AnyNumber, ITuple } from "@polkadot/types-codec/types";
 import type { CheckInherentsResult, InherentData } from "@polkadot/types/interfaces/blockbuilder";
 import type { BlockHash } from "@polkadot/types/interfaces/chain";
 import type { CollationInfo } from "@polkadot/types/interfaces/cumulus";
-import type {
-  BlockV2,
-  EthReceiptV3,
-  EthTransaction,
-  EthTransactionStatus,
-  TransactionV2,
-} from "@polkadot/types/interfaces/eth";
-import type { EvmAccount, EvmCallInfo, EvmCreateInfo } from "@polkadot/types/interfaces/evm";
+import type { EthTransaction, TransactionV2 } from "@polkadot/types/interfaces/eth";
 import type { Extrinsic } from "@polkadot/types/interfaces/extrinsics";
 import type { OpaqueMetadata } from "@polkadot/types/interfaces/metadata";
 import type { FeeDetails, RuntimeDispatchInfo } from "@polkadot/types/interfaces/payment";
@@ -37,12 +19,10 @@ import type {
   AccountId,
   Balance,
   Block,
-  H160,
   H256,
   Header,
   Index,
   KeyTypeId,
-  Permill,
   Weight,
 } from "@polkadot/types/interfaces/runtime";
 import type { RuntimeVersion } from "@polkadot/types/interfaces/state";
@@ -214,101 +194,6 @@ declare module "@polkadot/api-base/types/calls" {
       /** Generic call */
       [key: string]: DecoratedCallBase<ApiType>;
     };
-    /** 0x582211f65bb14b89/4 */
-    ethereumRuntimeRPCApi: {
-      /** Returns pallet_evm::Accounts by address. */
-      accountBasic: AugmentedCall<
-        ApiType,
-        (address: H160 | string | Uint8Array) => Observable<EvmAccount>
-      >;
-      /** For a given account address, returns pallet_evm::AccountCodes. */
-      accountCodeAt: AugmentedCall<
-        ApiType,
-        (address: H160 | string | Uint8Array) => Observable<Bytes>
-      >;
-      /** Returns the converted FindAuthor::find_author authority id. */
-      author: AugmentedCall<ApiType, () => Observable<H160>>;
-      /** Returns a frame_ethereum::call response. If `estimate` is true, */
-      call: AugmentedCall<
-        ApiType,
-        (
-          from: H160 | string | Uint8Array,
-          to: H160 | string | Uint8Array,
-          data: Bytes | string | Uint8Array,
-          value: U256 | AnyNumber | Uint8Array,
-          gasLimit: U256 | AnyNumber | Uint8Array,
-          maxFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber,
-          maxPriorityFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber,
-          nonce: Option<U256> | null | Uint8Array | U256 | AnyNumber,
-          estimate: bool | boolean | Uint8Array,
-          accessList:
-            | Option<Vec<ITuple<[H160, Vec<H256>]>>>
-            | null
-            | Uint8Array
-            | Vec<ITuple<[H160, Vec<H256>]>>
-            | [H160 | string | Uint8Array, Vec<H256> | (H256 | string | Uint8Array)[]][]
-        ) => Observable<Result<EvmCallInfo, DispatchError>>
-      >;
-      /** Returns runtime defined pallet_evm::ChainId. */
-      chainId: AugmentedCall<ApiType, () => Observable<u64>>;
-      /** Returns a frame_ethereum::call response. If `estimate` is true, */
-      create: AugmentedCall<
-        ApiType,
-        (
-          from: H160 | string | Uint8Array,
-          data: Bytes | string | Uint8Array,
-          value: U256 | AnyNumber | Uint8Array,
-          gasLimit: U256 | AnyNumber | Uint8Array,
-          maxFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber,
-          maxPriorityFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber,
-          nonce: Option<U256> | null | Uint8Array | U256 | AnyNumber,
-          estimate: bool | boolean | Uint8Array,
-          accessList:
-            | Option<Vec<ITuple<[H160, Vec<H256>]>>>
-            | null
-            | Uint8Array
-            | Vec<ITuple<[H160, Vec<H256>]>>
-            | [H160 | string | Uint8Array, Vec<H256> | (H256 | string | Uint8Array)[]][]
-        ) => Observable<Result<EvmCreateInfo, DispatchError>>
-      >;
-      /** Return all the current data for a block in a single runtime call. */
-      currentAll: AugmentedCall<
-        ApiType,
-        () => Observable<
-          ITuple<[Option<BlockV2>, Option<Vec<EthReceiptV3>>, Option<Vec<EthTransactionStatus>>]>
-        >
-      >;
-      /** Return the current block. */
-      currentBlock: AugmentedCall<ApiType, () => Observable<BlockV2>>;
-      /** Return the current receipt. */
-      currentReceipts: AugmentedCall<ApiType, () => Observable<Option<Vec<EthReceiptV3>>>>;
-      /** Return the current transaction status. */
-      currentTransactionStatuses: AugmentedCall<
-        ApiType,
-        () => Observable<Option<Vec<EthTransactionStatus>>>
-      >;
-      /** Return the elasticity multiplier. */
-      elasticity: AugmentedCall<ApiType, () => Observable<Option<Permill>>>;
-      /** Receives a `Vec<OpaqueExtrinsic>` and filters all the ethereum transactions. */
-      extrinsicFilter: AugmentedCall<
-        ApiType,
-        (
-          xts: Vec<Extrinsic> | (Extrinsic | IExtrinsic | string | Uint8Array)[]
-        ) => Observable<Vec<TransactionV2>>
-      >;
-      /** Returns FixedGasPrice::min_gas_price */
-      gasPrice: AugmentedCall<ApiType, () => Observable<u256>>;
-      /** For a given account address and index, returns pallet_evm::AccountStorages. */
-      storageAt: AugmentedCall<
-        ApiType,
-        (
-          address: H160 | string | Uint8Array,
-          index: u256 | AnyNumber | Uint8Array
-        ) => Observable<H256>
-      >;
-      /** Generic call */
-      [key: string]: DecoratedCallBase<ApiType>;
-    };
     /** 0x37e397fc7c91f5e4/1 */
     metadata: {
       /** Returns the metadata of a runtime */
diff --git a/typescript-api/src/moonbeam/interfaces/augment-api-runtime.ts b/typescript-api/src/moonbeam/interfaces/augment-api-runtime.ts
index bec563709c..86c3b96bde 100644
--- a/typescript-api/src/moonbeam/interfaces/augment-api-runtime.ts
+++ b/typescript-api/src/moonbeam/interfaces/augment-api-runtime.ts
@@ -6,30 +6,12 @@
 import "@polkadot/api-base/types/calls";
 
 import type { ApiTypes, AugmentedCall, DecoratedCallBase } from "@polkadot/api-base/types";
-import type {
-  Bytes,
-  Null,
-  Option,
-  Result,
-  U256,
-  Vec,
-  bool,
-  u256,
-  u32,
-  u64,
-} from "@polkadot/types-codec";
+import type { Bytes, Null, Option, Result, Vec, bool, u32 } from "@polkadot/types-codec";
 import type { AnyNumber, ITuple } from "@polkadot/types-codec/types";
 import type { CheckInherentsResult, InherentData } from "@polkadot/types/interfaces/blockbuilder";
 import type { BlockHash } from "@polkadot/types/interfaces/chain";
 import type { CollationInfo } from "@polkadot/types/interfaces/cumulus";
-import type {
-  BlockV2,
-  EthReceiptV3,
-  EthTransaction,
-  EthTransactionStatus,
-  TransactionV2,
-} from "@polkadot/types/interfaces/eth";
-import type { EvmAccount, EvmCallInfo, EvmCreateInfo } from "@polkadot/types/interfaces/evm";
+import type { EthTransaction, TransactionV2 } from "@polkadot/types/interfaces/eth";
 import type { Extrinsic } from "@polkadot/types/interfaces/extrinsics";
 import type { OpaqueMetadata } from "@polkadot/types/interfaces/metadata";
 import type { FeeDetails, RuntimeDispatchInfo } from "@polkadot/types/interfaces/payment";
@@ -37,12 +19,10 @@ import type {
   AccountId,
   Balance,
   Block,
-  H160,
   H256,
   Header,
   Index,
   KeyTypeId,
-  Permill,
   Weight,
 } from "@polkadot/types/interfaces/runtime";
 import type { RuntimeVersion } from "@polkadot/types/interfaces/state";
@@ -214,101 +194,6 @@ declare module "@polkadot/api-base/types/calls" {
       /** Generic call */
       [key: string]: DecoratedCallBase<ApiType>;
     };
-    /** 0x582211f65bb14b89/4 */
-    ethereumRuntimeRPCApi: {
-      /** Returns pallet_evm::Accounts by address. */
-      accountBasic: AugmentedCall<
-        ApiType,
-        (address: H160 | string | Uint8Array) => Observable<EvmAccount>
-      >;
-      /** For a given account address, returns pallet_evm::AccountCodes. */
-      accountCodeAt: AugmentedCall<
-        ApiType,
-        (address: H160 | string | Uint8Array) => Observable<Bytes>
-      >;
-      /** Returns the converted FindAuthor::find_author authority id. */
-      author: AugmentedCall<ApiType, () => Observable<H160>>;
-      /** Returns a frame_ethereum::call response. If `estimate` is true, */
-      call: AugmentedCall<
-        ApiType,
-        (
-          from: H160 | string | Uint8Array,
-          to: H160 | string | Uint8Array,
-          data: Bytes | string | Uint8Array,
-          value: U256 | AnyNumber | Uint8Array,
-          gasLimit: U256 | AnyNumber | Uint8Array,
-          maxFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber,
-          maxPriorityFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber,
-          nonce: Option<U256> | null | Uint8Array | U256 | AnyNumber,
-          estimate: bool | boolean | Uint8Array,
-          accessList:
-            | Option<Vec<ITuple<[H160, Vec<H256>]>>>
-            | null
-            | Uint8Array
-            | Vec<ITuple<[H160, Vec<H256>]>>
-            | [H160 | string | Uint8Array, Vec<H256> | (H256 | string | Uint8Array)[]][]
-        ) => Observable<Result<EvmCallInfo, DispatchError>>
-      >;
-      /** Returns runtime defined pallet_evm::ChainId. */
-      chainId: AugmentedCall<ApiType, () => Observable<u64>>;
-      /** Returns a frame_ethereum::call response. If `estimate` is true, */
-      create: AugmentedCall<
-        ApiType,
-        (
-          from: H160 | string | Uint8Array,
-          data: Bytes | string | Uint8Array,
-          value: U256 | AnyNumber | Uint8Array,
-          gasLimit: U256 | AnyNumber | Uint8Array,
-          maxFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber,
-          maxPriorityFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber,
-          nonce: Option<U256> | null | Uint8Array | U256 | AnyNumber,
-          estimate: bool | boolean | Uint8Array,
-          accessList:
-            | Option<Vec<ITuple<[H160, Vec<H256>]>>>
-            | null
-            | Uint8Array
-            | Vec<ITuple<[H160, Vec<H256>]>>
-            | [H160 | string | Uint8Array, Vec<H256> | (H256 | string | Uint8Array)[]][]
-        ) => Observable<Result<EvmCreateInfo, DispatchError>>
-      >;
-      /** Return all the current data for a block in a single runtime call. */
-      currentAll: AugmentedCall<
-        ApiType,
-        () => Observable<
-          ITuple<[Option<BlockV2>, Option<Vec<EthReceiptV3>>, Option<Vec<EthTransactionStatus>>]>
-        >
-      >;
-      /** Return the current block. */
-      currentBlock: AugmentedCall<ApiType, () => Observable<BlockV2>>;
-      /** Return the current receipt. */
-      currentReceipts: AugmentedCall<ApiType, () => Observable<Option<Vec<EthReceiptV3>>>>;
-      /** Return the current transaction status. */
-      currentTransactionStatuses: AugmentedCall<
-        ApiType,
-        () => Observable<Option<Vec<EthTransactionStatus>>>
-      >;
-      /** Return the elasticity multiplier. */
-      elasticity: AugmentedCall<ApiType, () => Observable<Option<Permill>>>;
-      /** Receives a `Vec<OpaqueExtrinsic>` and filters all the ethereum transactions. */
-      extrinsicFilter: AugmentedCall<
-        ApiType,
-        (
-          xts: Vec<Extrinsic> | (Extrinsic | IExtrinsic | string | Uint8Array)[]
-        ) => Observable<Vec<TransactionV2>>
-      >;
-      /** Returns FixedGasPrice::min_gas_price */
-      gasPrice: AugmentedCall<ApiType, () => Observable<u256>>;
-      /** For a given account address and index, returns pallet_evm::AccountStorages. */
-      storageAt: AugmentedCall<
-        ApiType,
-        (
-          address: H160 | string | Uint8Array,
-          index: u256 | AnyNumber | Uint8Array
-        ) => Observable<H256>
-      >;
-      /** Generic call */
-      [key: string]: DecoratedCallBase<ApiType>;
-    };
     /** 0x37e397fc7c91f5e4/1 */
     metadata: {
       /** Returns the metadata of a runtime */
diff --git a/typescript-api/src/moonriver/interfaces/augment-api-runtime.ts b/typescript-api/src/moonriver/interfaces/augment-api-runtime.ts
index bec563709c..86c3b96bde 100644
--- a/typescript-api/src/moonriver/interfaces/augment-api-runtime.ts
+++ b/typescript-api/src/moonriver/interfaces/augment-api-runtime.ts
@@ -6,30 +6,12 @@
 import "@polkadot/api-base/types/calls";
 
 import type { ApiTypes, AugmentedCall, DecoratedCallBase } from "@polkadot/api-base/types";
-import type {
-  Bytes,
-  Null,
-  Option,
-  Result,
-  U256,
-  Vec,
-  bool,
-  u256,
-  u32,
-  u64,
-} from "@polkadot/types-codec";
+import type { Bytes, Null, Option, Result, Vec, bool, u32 } from "@polkadot/types-codec";
 import type { AnyNumber, ITuple } from "@polkadot/types-codec/types";
 import type { CheckInherentsResult, InherentData } from "@polkadot/types/interfaces/blockbuilder";
 import type { BlockHash } from "@polkadot/types/interfaces/chain";
 import type { CollationInfo } from "@polkadot/types/interfaces/cumulus";
-import type {
-  BlockV2,
-  EthReceiptV3,
-  EthTransaction,
-  EthTransactionStatus,
-  TransactionV2,
-} from "@polkadot/types/interfaces/eth";
-import type { EvmAccount, EvmCallInfo, EvmCreateInfo } from "@polkadot/types/interfaces/evm";
+import type { EthTransaction, TransactionV2 } from "@polkadot/types/interfaces/eth";
 import type { Extrinsic } from "@polkadot/types/interfaces/extrinsics";
 import type { OpaqueMetadata } from "@polkadot/types/interfaces/metadata";
 import type { FeeDetails, RuntimeDispatchInfo } from "@polkadot/types/interfaces/payment";
@@ -37,12 +19,10 @@ import type {
   AccountId,
   Balance,
   Block,
-  H160,
   H256,
   Header,
   Index,
   KeyTypeId,
-  Permill,
   Weight,
 } from "@polkadot/types/interfaces/runtime";
 import type { RuntimeVersion } from "@polkadot/types/interfaces/state";
@@ -214,101 +194,6 @@ declare module "@polkadot/api-base/types/calls" {
       /** Generic call */
       [key: string]: DecoratedCallBase<ApiType>;
     };
-    /** 0x582211f65bb14b89/4 */
-    ethereumRuntimeRPCApi: {
-      /** Returns pallet_evm::Accounts by address. */
-      accountBasic: AugmentedCall<
-        ApiType,
-        (address: H160 | string | Uint8Array) => Observable<EvmAccount>
-      >;
-      /** For a given account address, returns pallet_evm::AccountCodes. */
-      accountCodeAt: AugmentedCall<
-        ApiType,
-        (address: H160 | string | Uint8Array) => Observable<Bytes>
-      >;
-      /** Returns the converted FindAuthor::find_author authority id. */
-      author: AugmentedCall<ApiType, () => Observable<H160>>;
-      /** Returns a frame_ethereum::call response. If `estimate` is true, */
-      call: AugmentedCall<
-        ApiType,
-        (
-          from: H160 | string | Uint8Array,
-          to: H160 | string | Uint8Array,
-          data: Bytes | string | Uint8Array,
-          value: U256 | AnyNumber | Uint8Array,
-          gasLimit: U256 | AnyNumber | Uint8Array,
-          maxFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber,
-          maxPriorityFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber,
-          nonce: Option<U256> | null | Uint8Array | U256 | AnyNumber,
-          estimate: bool | boolean | Uint8Array,
-          accessList:
-            | Option<Vec<ITuple<[H160, Vec<H256>]>>>
-            | null
-            | Uint8Array
-            | Vec<ITuple<[H160, Vec<H256>]>>
-            | [H160 | string | Uint8Array, Vec<H256> | (H256 | string | Uint8Array)[]][]
-        ) => Observable<Result<EvmCallInfo, DispatchError>>
-      >;
-      /** Returns runtime defined pallet_evm::ChainId. */
-      chainId: AugmentedCall<ApiType, () => Observable<u64>>;
-      /** Returns a frame_ethereum::call response. If `estimate` is true, */
-      create: AugmentedCall<
-        ApiType,
-        (
-          from: H160 | string | Uint8Array,
-          data: Bytes | string | Uint8Array,
-          value: U256 | AnyNumber | Uint8Array,
-          gasLimit: U256 | AnyNumber | Uint8Array,
-          maxFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber,
-          maxPriorityFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber,
-          nonce: Option<U256> | null | Uint8Array | U256 | AnyNumber,
-          estimate: bool | boolean | Uint8Array,
-          accessList:
-            | Option<Vec<ITuple<[H160, Vec<H256>]>>>
-            | null
-            | Uint8Array
-            | Vec<ITuple<[H160, Vec<H256>]>>
-            | [H160 | string | Uint8Array, Vec<H256> | (H256 | string | Uint8Array)[]][]
-        ) => Observable<Result<EvmCreateInfo, DispatchError>>
-      >;
-      /** Return all the current data for a block in a single runtime call. */
-      currentAll: AugmentedCall<
-        ApiType,
-        () => Observable<
-          ITuple<[Option<BlockV2>, Option<Vec<EthReceiptV3>>, Option<Vec<EthTransactionStatus>>]>
-        >
-      >;
-      /** Return the current block. */
-      currentBlock: AugmentedCall<ApiType, () => Observable<BlockV2>>;
-      /** Return the current receipt. */
-      currentReceipts: AugmentedCall<ApiType, () => Observable<Option<Vec<EthReceiptV3>>>>;
-      /** Return the current transaction status. */
-      currentTransactionStatuses: AugmentedCall<
-        ApiType,
-        () => Observable<Option<Vec<EthTransactionStatus>>>
-      >;
-      /** Return the elasticity multiplier. */
-      elasticity: AugmentedCall<ApiType, () => Observable<Option<Permill>>>;
-      /** Receives a `Vec<OpaqueExtrinsic>` and filters all the ethereum transactions. */
-      extrinsicFilter: AugmentedCall<
-        ApiType,
-        (
-          xts: Vec<Extrinsic> | (Extrinsic | IExtrinsic | string | Uint8Array)[]
-        ) => Observable<Vec<TransactionV2>>
-      >;
-      /** Returns FixedGasPrice::min_gas_price */
-      gasPrice: AugmentedCall<ApiType, () => Observable<u256>>;
-      /** For a given account address and index, returns pallet_evm::AccountStorages. */
-      storageAt: AugmentedCall<
-        ApiType,
-        (
-          address: H160 | string | Uint8Array,
-          index: u256 | AnyNumber | Uint8Array
-        ) => Observable<H256>
-      >;
-      /** Generic call */
-      [key: string]: DecoratedCallBase<ApiType>;
-    };
     /** 0x37e397fc7c91f5e4/1 */
     metadata: {
       /** Returns the metadata of a runtime */