build: fix forge submodules

.gitmodules

@@ -1,21 +1,21 @@
-[submodule "circuits/plonky2x/contracts/forge/lib/forge-std"]
-	path = circuits/plonky2x/contracts/forge/lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
 [submodule "vendor/starkyx"]
 	path = vendor/starkyx
 	url = [email protected]:succinctlabs/starkyx.git
 [submodule "vendor/succinctx"]
 	path = vendor/succinctx
 	url = [email protected]:succinctlabs/succinctx.git
-[submodule "circuits/plonky2x/verifier/lib/openzeppelin-contracts-upgradeable"]
-	path = circuits/plonky2x/verifier/lib/openzeppelin-contracts-upgradeable
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
-[submodule "circuits/plonky2x/verifier/lib/openzeppelin-contracts"]
-	path = circuits/plonky2x/verifier/lib/openzeppelin-contracts
+[submodule "nearx/contract/lib/openzeppelin-contracts"]
+	path = nearx/contract/lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "circuits/plonky2x/verifier/lib/foundry-devops"]
-	path = circuits/plonky2x/verifier/lib/foundry-devops
+[submodule "nearx/contract/lib/openzeppelin-contracts-upgradeable"]
+	path = nearx/contract/lib/openzeppelin-contracts-upgradeable
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
+[submodule "nearx/contract/lib/foundry-devops"]
+	path = nearx/contract/lib/foundry-devops
 	url = https://github.com/chainaccelorg/foundry-devops
-[submodule "circuits/plonky2x/contract/lib/solidity-bytes-utils"]
-	path = circuits/plonky2x/contract/lib/solidity-bytes-utils
+[submodule "nearx/contract/lib/solidity-bytes-utils"]
+	path = nearx/contract/lib/solidity-bytes-utils
 	url = https://github.com/GNSPS/solidity-bytes-utils
+[submodule "nearx/contract/lib/forge-std"]
+	path = nearx/contract/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std

bin/client/src/client/mod.rs

@@ -113,7 +113,7 @@ impl Handler<BatchGetProof> for LightClient {
 
 impl LightClient {
     pub fn new(config: &Config) -> Result<Self> {
-        let client = rpc::NearRpcClient::new(config.network.clone());
+        let client = rpc::NearRpcClient::new(config.network);
 
         // TODO: store selector in config
         let store = store::sled::init(config)?;

nearx/src/hint.rs

@@ -21,7 +21,7 @@ impl<L: PlonkParameters<D>, const D: usize> AsyncHint<L, D> for FetchNextHeaderI
         input_stream: &mut ValueStream<L, D>,
         output_stream: &mut ValueStream<L, D>,
     ) {
-        let client = NearRpcClient::new(self.0.clone());
+        let client = NearRpcClient::new(self.0);
 
         let h = input_stream.read_value::<CryptoHashVariable>().0;
 
@@ -59,7 +59,7 @@ impl<L: PlonkParameters<D>, const D: usize> AsyncHint<L, D> for FetchHeaderInput
         input_stream: &mut ValueStream<L, D>,
         output_stream: &mut ValueStream<L, D>,
     ) {
-        let client = NearRpcClient::new(self.0.clone());
+        let client = NearRpcClient::new(self.0);
 
         let h = input_stream.read_value::<CryptoHashVariable>().0;
 
@@ -102,7 +102,7 @@ impl<L: PlonkParameters<D>, const D: usize, const B: usize> AsyncHint<L, D>
         input_stream: &mut ValueStream<L, D>,
         output_stream: &mut ValueStream<L, D>,
     ) {
-        let client = NearRpcClient::new(self.0.clone());
+        let client = NearRpcClient::new(self.0);
         let block_merkle_root = input_stream.read_value::<CryptoHashVariable>().0;
         let last_verified = input_stream.read_value::<CryptoHashVariable>().0;