Skip to content

Commit

Permalink
Pin NEAR DA in main repo and mod tidy (#291)
Browse files Browse the repository at this point in the history
  • Loading branch information
Hyodar authored Sep 26, 2024
1 parent e91e608 commit 6c97b1e
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 69 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ tests-contract: ## runs all forge tests
near-da-rpc-sys:
rm -rf relayer/libs && \
mkdir relayer/libs && \
git clone https://github.com/taco-paco/rollup-data-availability.git && \
git clone https://github.com/near/rollup-data-availability.git && \
cd rollup-data-availability && \
git checkout c9ec12924b27e37b8c40e7ab1a051a64b363cfd6 && \
git checkout 6b7d76a28d7e3315c8b1c0f805cd665fc85dfd23 && \
make da-rpc-sys && \
cp gopkg/da-rpc/lib/* ../relayer/libs && \
cd .. && \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ extended finality time.

In order to solve this problem, the Nuffle Fast Finality Layer (NFFL, formerly SFFL) was
designed. Through it, various chains can, while supplying block data to
[NEAR DA](https://github.com/near/rollup-data-availability), rely on the
[NEAR DA](https://github.com/Nuffle-Labs/data-availability), rely on the
economic security of an [EigenLayer](https://www.eigenlayer.xyz) AVS to provide
a faster block finality to various protocols and use-cases while also including
an additional public DA layer into their stack.
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/design/incentives.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ the Relayer role can be fulfilled by a decentralised network.

Independent of what the Relayer implementation looks like, the Relayer needs to
pay $NEAR to submit blocks to
[NEAR DA](https://github.com/near/rollup-data-availability). The rewards for the
[NEAR DA](https://github.com/Nuffle-Labs/data-availability). The rewards for the
Relayer at the least need to compensate the Relayer's fee expenditure.

In this specific case, it should be a reasonable approach that each network
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ extended finality time.

In order to solve this problem, the Nuffle Fast Finality Layer (NFFL, formerly SFFL) was
designed. Through it, various chains can, while supplying block data to
[NEAR DA](https://github.com/near/rollup-data-availability), rely on the
[NEAR DA](https://github.com/Nuffle-Labs/data-availability), rely on the
economic security of an [EigenLayer](https://www.eigenlayer.xyz) AVS to provide
a faster block finality to various protocols and use-cases while also including
an additional public DA layer into their stack.
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/gorilla/mux v1.8.1
github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/near/borsh-go v0.3.1
github.com/near/rollup-data-availability v0.2.4-0.20240327150603-b004cd803551
github.com/near/rollup-data-availability v0.2.4-0.20240507152131-6b7d76a28d7e
github.com/pokt-network/smt v0.9.2
github.com/prometheus/client_golang v1.19.0
github.com/stretchr/testify v1.9.0
Expand Down Expand Up @@ -125,5 +125,3 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
rsc.io/tmplfunc v0.0.3 // indirect
)

replace github.com/near/rollup-data-availability v0.2.4-0.20240327150603-b004cd803551 => github.com/taco-paco/rollup-data-availability v0.0.0-20240409111524-c9ec12924b27
68 changes: 10 additions & 58 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion indexer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ The purpose of this indexer is to retrieve valid submissions to near da contract

## How to setup

For testing purposes the [following contract](https://github.com/near/rollup-data-availability/tree/main/contracts/blob-store) was used.
For testing purposes the [following contract](https://github.com/Nuffle-Labs/data-availability/tree/main/contracts/blob-store) was used.

### Localnet

Expand Down
4 changes: 2 additions & 2 deletions relayer/cmd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ FROM rust:1.77 AS near-da-builder
RUN cargo install --force cbindgen

WORKDIR /near-da
RUN git clone https://github.com/taco-paco/rollup-data-availability.git
RUN git clone https://github.com/near/rollup-data-availability.git

WORKDIR /near-da/rollup-data-availability
RUN git checkout c9ec12924b27e37b8c40e7ab1a051a64b363cfd6
RUN git checkout 6b7d76a28d7e3315c8b1c0f805cd665fc85dfd23

# Build & copy libnear_da_rpc_sys static library for relayer compilation
RUN make da-rpc-sys
Expand Down

0 comments on commit 6c97b1e

Please sign in to comment.