2192 ics08 near light client

Cargo.toml

@@ -55,7 +55,7 @@ members = [
 
   "light-clients/arbitrum-light-client",
   "light-clients/berachain-light-client",
-  "light-clients/cometbls-light-client",
+  "light-clients/cometbls/ics08",
   "light-clients/ethereum-light-client",
   "light-clients/scroll-light-client",
   "light-clients/tendermint-light-client",
@@ -70,11 +70,16 @@ members = [
   "unionvisor",
   "voyager",
   "near/near-ibc",
-  "near/near-light-client",
+  "light-clients/near/near",
   "near/dummy-ibc-app",
-  "near/near-ibc-tests",
 
   "drip",
+  "near/near-ibc-tests",
+  "light-clients/near/ics08-near",
+  "lib/near-verifier",
+  "light-clients/cometbls/near",
+  "poc-relayer",
+  "near/test-circuit",
 ]
 
 [workspace.package]
@@ -110,6 +115,7 @@ ics23                     = { path = "lib/ics23", default-features = false }
 linea-verifier            = { path = "lib/linea-verifier", default-features = false }
 linea-zktrie              = { path = "lib/linea-zktrie", default-features = false }
 macros                    = { path = "lib/macros", default-features = false }
+near-verifier             = { path = "lib/near-verifier", default-features = false }
 pg-queue                  = { path = "lib/pg-queue", default-features = false }
 poseidon-rs               = { path = "lib/poseidon-rs", default-features = false }
 protos                    = { path = "generated/rust/protos", default-features = false }
@@ -172,6 +178,7 @@ go-parse-duration        = { version = "0.1.1", default-features = false }
 hex                      = { version = "0.4.3", default-features = false }
 hex-literal              = { version = "0.4.1", default-features = false }
 lazy_static              = { version = "1.4.0", default-features = false }
+near-account-id          = { version = "1.0.0", default-features = false }
 near-contract-standards  = { version = "5.1.0", default-features = false }
 near-sdk                 = { version = "5.1.0", default-features = false }
 near-sdk-contract-tools  = { version = "3.0.2", default-features = false }

flake.nix

@@ -257,7 +257,7 @@
         ./site/openapi.nix
         ./near/near.nix
         ./light-clients/ethereum-light-client/ethereum-light-client.nix
-        ./light-clients/cometbls-light-client/cometbls-light-client.nix
+        ./light-clients/cometbls/cometbls-light-client.nix
         ./light-clients/tendermint-light-client/tendermint-light-client.nix
         ./light-clients/scroll-light-client/scroll-light-client.nix
         ./light-clients/arbitrum-light-client/arbitrum-light-client.nix
@@ -333,11 +333,13 @@
 
           goPkgs = import inputs.nixpkgs-go { inherit system; };
           unstablePkgs = import inputs.nixpkgs-unstable { inherit system; };
+          packageOverrides = pkgs.callPackage ./python-packages.nix { };
+          python = pkgs.python3.override { inherit packageOverrides; };
         in
         {
           _module = {
             args = {
-              inherit nixpkgs dbg get-flake uniondBundleVersions goPkgs unstablePkgs mkCi;
+              inherit nixpkgs dbg get-flake uniondBundleVersions goPkgs unstablePkgs mkCi python;
 
               gitRev =
                 if (builtins.hasAttr "rev" self) then self.rev else "dirty";
@@ -525,13 +527,26 @@
               postgresql
               emmet-language-server
               nodePackages.graphqurl
+              nodePackages_latest.near-cli
               nodePackages_latest.nodejs
               nodePackages_latest.svelte-language-server
               nodePackages_latest."@astrojs/language-server"
               nodePackages_latest."@tailwindcss/language-server"
               nodePackages_latest.typescript-language-server
               nodePackages_latest.vscode-langservers-extracted
-            ])
+            ]) ++
+              (with pkgs; [
+                go
+                gopls
+                go-tools
+                gotools
+              ])
+              ++ [
+              (python.withPackages (py-pkgs: [
+                py-pkgs.nearup
+              ]))
+            ]
+
               ++ (with goPkgs; [
               go
               gopls

lib/block-message/src/chain.rs

@@ -114,6 +114,7 @@ pub mod arbitrum;
 pub mod berachain;
 pub mod cosmos;
 pub mod ethereum;
+pub mod near;
 pub mod scroll;
 pub mod union;
 

lib/block-message/src/chain/near.rs

@@ -0,0 +1,32 @@
+use chain_utils::near::Near;
+use queue_msg::Op;
+use unionlabs::never::Never;
+
+use crate::{
+    fetch::{AnyFetch, DoFetchBlockRange, Fetch, FetchBlockRange},
+    AnyChainIdentified, BlockMessage, ChainExt, Identified,
+};
+
+impl ChainExt for Near {
+    type Data = Never;
+
+    type Fetch = Never;
+
+    type Aggregate = Never;
+}
+
+impl DoFetchBlockRange<Near> for Near
+where
+    AnyChainIdentified<AnyFetch>: From<Identified<Near, Fetch<Near>>>,
+{
+    fn fetch_block_range(c: &Near, range: FetchBlockRange<Near>) -> Op<BlockMessage> {
+        // fetch(id(
+        //     c.chain_id(),
+        //     Fetch::<Near>::specific(FetchEvents {
+        //         from_height: range.from_height,
+        //         to_height: range.to_height,
+        //     }),
+        // ))
+        todo!()
+    }
+}

lib/block-message/src/fetch.rs

@@ -7,7 +7,7 @@ use queue_msg::{
     aggregate, conc, fetch, queue_msg, wait, HandleFetch, Op, QueueError, QueueMessage,
 };
 use tracing::instrument;
-use unionlabs::ibc::core::client::height::IsHeight;
+use unionlabs::{ibc::core::client::height::IsHeight, never::Never};
 
 use crate::{
     aggregate::{Aggregate, AggregateFetchBlockRange, AnyAggregate},
@@ -94,6 +94,12 @@ pub trait DoFetch<C: ChainExt>: Sized + Debug + Clone + PartialEq {
     fn do_fetch(c: &C, _: Self) -> impl Future<Output = Op<BlockMessage>>;
 }
 
+impl<C: ChainExt> DoFetch<C> for Never {
+    fn do_fetch(_: &C, this: Self) -> impl Future<Output = Op<BlockMessage>> {
+        async move { match this {} }
+    }
+}
+
 pub trait DoFetchBlockRange<C: ChainExt>: ChainExt {
     fn fetch_block_range(c: &C, range: FetchBlockRange<C>) -> Op<BlockMessage>;
 }