Skip to content

Commit

Permalink
chore: fmt
Browse files Browse the repository at this point in the history 
Signed-off-by: aeryz <[email protected]>
  • Loading branch information
@aeryz
aeryz committed Jul 26, 2024
1 parent 0b3f86d commit 94760bf
Show file tree
Hide file tree
Showing 13 changed files with 133 additions and 125 deletions.
10 changes: 7 additions & 3 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,11 @@ members = [
"light-clients/near/near",
"near/dummy-ibc-app",
"near/near-ibc-tests",
"light-clients/near/ics08-near", "lib/near-verifier", "light-clients/cometbls/near", "poc-relayer", "near/test-circuit",
"light-clients/near/ics08-near",
"lib/near-verifier",
"light-clients/cometbls/near",
"poc-relayer",
"near/test-circuit",
]

[workspace.package]
Expand Down Expand Up @@ -101,7 +105,6 @@ cometbls-groth16-verifier = { path = "lib/cometbls-groth16-verifier", default-fe
contracts = { path = "generated/rust/contracts", default-features = false }
ethereum-light-client = { path = "light-clients/ethereum-light-client", default-features = false }
ethereum-verifier = { path = "lib/ethereum-verifier", default-features = false }
near-verifier = { path = "lib/near-verifier", default-features = false }
gnark-key-parser = { path = "lib/gnark-key-parser", default-features = false }
gnark-mimc = { path = "lib/gnark-mimc", default-features = false }
ibc-vm-rs = { path = "lib/ibc-vm-rs", default-features = false }
Expand All @@ -110,6 +113,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 }
Expand Down Expand Up @@ -173,9 +177,9 @@ 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-account-id = { version = "1.0.0", default-features = false }
near-sdk-contract-tools = { version = "3.0.2", default-features = false }
num-bigint = { version = "0.4", default-features = false }
primitive-types = { version = "0.12.1", default-features = false }
Expand Down
20 changes: 11 additions & 9 deletions flake.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -520,15 +520,17 @@
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 pkgs; [
go
gopls
go-tools
gotools
])
++ [
(python.withPackages (py-pkgs: [
py-pkgs.nearup
]))
]

++ (with goPkgs; [
go
Expand Down
6 changes: 3 additions & 3 deletions lib/chain-utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ frame-support-procedural = { workspace = true }
futures = { workspace = true }
hex = { workspace = true }
ics23 = { workspace = true }
near-jsonrpc-client = "0.10.1"
near-primitives = "0.23.0"
near-primitives-core = "0.23.0"
num-rational = "0.4.2"
num_enum = "0.7.0"
prost = { workspace = true }
Expand All @@ -40,9 +43,6 @@ thiserror = { workspace = true }
tokio = { workspace = true }
tracing = { workspace = true }
typenum = { workspace = true, features = ["const-generics", "no_std"] }
near-jsonrpc-client = "0.10.1"
near-primitives = "0.23.0"
near-primitives-core = "0.23.0"

[features]
arbitrary = ["dep:arbitrary"]
Expand Down
22 changes: 11 additions & 11 deletions lib/near-verifier/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
[package]
name = "near-verifier"
version = "0.1.0"
edition.workspace = true
license-file.workspace = true
repository.workspace = true
authors = ["Union Labs"]
edition.workspace = true
license-file.workspace = true
name = "near-verifier"
repository.workspace = true
version = "0.1.0"

[dependencies]
unionlabs = { workspace = true, features = [ "near" ] }
borsh = { workspace = true }
near-account-id = { workspace = true }
near-primitives-core = { version = "0.23" }
thiserror = { workspace = true }
sha2 = { workspace = true }
serde = { workspace = true }
near-account-id = { workspace = true }
borsh = { workspace = true }
serde = { workspace = true }
serde_json.workspace = true
sha2 = { workspace = true }
thiserror = { workspace = true }
unionlabs = { workspace = true, features = ["near"] }

[lints]
workspace = true
2 changes: 1 addition & 1 deletion lib/unionlabs/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ wasmparser = { version = "0.113" }

borsh = { workspace = true, features = ["derive"] }
bs58 = "0.4"
near-account-id = { workspace = true }
near-primitives-core = { version = "0.23" }
near-account-id = { workspace = true }
schemars = { workspace = true, features = ["derive"], optional = true }

[dev-dependencies]
Expand Down
30 changes: 15 additions & 15 deletions light-clients/cometbls/near/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
[package]
name = "cometbls-near"
version = "0.1.0"
edition.workspace = true
edition.workspace = true
license-file.workspace = true
repository.workspace = true
name = "cometbls-near"
repository.workspace = true
version = "0.1.0"

[lib]
crate-type = ["cdylib"]

[dependencies]
near-sdk = { workspace = true, features = ["wee_alloc"] }
near-sdk-contract-tools = { workspace = true }
ibc-vm-rs = { workspace = true }
unionlabs = { workspace = true, features = [ "near" ] }
near-contract-standards = { workspace = true }
near-primitives-core = { version = "0.21" }
borsh = { workspace = true, features = [ "derive"] }
thiserror = { workspace = true }
ics23 = { workspace = true }
borsh = { workspace = true, features = ["derive"] }
cometbls-groth16-verifier = { workspace = true }
hex-literal = {workspace = true }
hex.workspace = true
hex-literal = { workspace = true }
hex.workspace = true
ibc-vm-rs = { workspace = true }
ics23 = { workspace = true }
near-contract-standards = { workspace = true }
near-primitives-core = { version = "0.21" }
near-sdk = { workspace = true, features = ["wee_alloc"] }
near-sdk-contract-tools = { workspace = true }
thiserror = { workspace = true }
unionlabs = { workspace = true, features = ["near"] }

[lints]
workspace = true
22 changes: 11 additions & 11 deletions light-clients/near/ics08-near/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
bytes = { workspace = true }
cosmwasm-std = { workspace = true, features = ["abort", "iterator"] }
cw-storage-plus = { workspace = true }
dlmalloc = { workspace = true, features = ["global"] }
hex = { workspace = true }
prost = { workspace = true }
Expand All @@ -27,19 +28,18 @@ serde-utils = { workspace = true }
sha2 = { workspace = true }
sha3 = { workspace = true }
thiserror = { workspace = true }
cw-storage-plus = { workspace = true }

ics008-wasm-client = { workspace = true }
unionlabs = { workspace = true, features = [ "near" ] }
borsh = { workspace = true }
ics008-wasm-client = { workspace = true }
near-primitives-core = { version = "0.23" }
near-verifier = { workspace = true }
borsh = { workspace = true }
near-verifier = { workspace = true }
unionlabs = { workspace = true, features = ["near"] }

base64 = { workspace = true }
base64 = { workspace = true }
[dev-dependencies]
lazy_static = "1.4.0"
serde_json = { workspace = true }
lazy_static = "1.4.0"
near-crypto = "0.23"
near-jsonrpc-client = "0.10.1"
tokio = { workspace = true, features = [ "full" ] }
near-primitives = "0.23.0"
near-crypto = "0.23"
near-primitives = "0.23.0"
serde_json = { workspace = true }
tokio = { workspace = true, features = ["full"] }
2 changes: 1 addition & 1 deletion light-clients/near/near/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ near-contract-standards = { workspace = true }
near-primitives-core = { version = "0.21" }
near-sdk = { workspace = true, features = ["wee_alloc"] }
near-sdk-contract-tools = { workspace = true }
near-verifier = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
unionlabs = { workspace = true, features = ["near"] }
near-verifier = { workspace = true }

[dev-dependencies]
anyhow = "1.0"
Expand Down
8 changes: 5 additions & 3 deletions near/near.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,11 @@
near-localnet = pkgs.writeShellApplication {
name = "near-localnet";
# runtimeInputs = [ nearup ];
runtimeInputs = [(python.withPackages (py-pkgs: [
py-pkgs.nearup
]))] ++ [ pkgs.strace pkgs.iproute pkgs.busybox unstablePkgs.nodePackages_latest.near-cli ];
runtimeInputs = [
(python.withPackages (py-pkgs: [
py-pkgs.nearup
]))
] ++ [ pkgs.strace pkgs.iproute pkgs.busybox unstablePkgs.nodePackages_latest.near-cli ];
text = ''
mkdir /tmp
export TMPDIR=/tmp
Expand Down
10 changes: 5 additions & 5 deletions near/test-circuit/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "test-circuit"
version = "0.1.0"
edition.workspace = true
edition.workspace = true
license-file.workspace = true
repository.workspace = true
name = "test-circuit"
repository.workspace = true
version = "0.1.0"

[lints]
workspace = true
Expand All @@ -23,8 +23,8 @@ unionlabs = { workspace = true, features = ["near"] }
# near-primitives = { git = "https://github.com/near/nearcore" }
base64 = { workspace = true }
env_logger = "0.9"
hex-literal.workspace = true
hex.workspace = true
hex-literal.workspace = true
near-crypto = "0.20"
near-jsonrpc-client = "0.8"
near-jsonrpc-primitives = "0.20"
Expand Down
8 changes: 4 additions & 4 deletions networks/services/near.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
{
image = {
enableRecommendedContents = true;
contents = [
pkgs.coreutils
near-localnet
];
contents = [
pkgs.coreutils
near-localnet
];
};
service = {
tty = true;
Expand Down
48 changes: 24 additions & 24 deletions poc-relayer/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
[package]
name = "poc-relayer"
version = "0.1.0"
edition.workspace = true
edition.workspace = true
license-file.workspace = true
repository.workspace = true
name = "poc-relayer"
repository.workspace = true
version = "0.1.0"

[dependencies]
tokio = { workspace = true, features = [ "full" ] }
near-primitives = "0.23.0"
base64 = { workspace = true }
borsh = { workspace = true, features = ["borsh-derive"] }
chain-utils = { workspace = true }
cometbft-rpc = { workspace = true }
hex.workspace = true
ibc-vm-rs.workspace = true
near-crypto = "0.23"
base64 = { workspace = true }
serde_json = { workspace = true }
near-jsonrpc-client = "0.10.1"
near-jsonrpc-client = "0.10.1"
near-jsonrpc-primitives = "0.23"
unionlabs = { workspace = true, features = [ "near" ] }
near-primitives-core = { version = "0.23" }
serde.workspace = true
borsh = { workspace = true, features = ["borsh-derive"] }
cometbft-rpc = { workspace = true }
tendermint-rpc = { workspace = true, features = ["http-client", "websocket-client", "default"] }
chain-utils = { workspace = true }
prost = { workspace = true }
protos.workspace = true
hex.workspace = true
ibc-vm-rs.workspace = true
near-verifier = { workspace = true }
tendermint = { workspace = true }
num-bigint = { workspace = true }
tendermint-proto = { workspace = true }
near-primitives = "0.23.0"
near-primitives-core = { version = "0.23" }
near-verifier = { workspace = true }
num-bigint = { workspace = true }
prost = { workspace = true }
protos.workspace = true
serde.workspace = true
serde_json = { workspace = true }
tendermint = { workspace = true }
tendermint-proto = { workspace = true }
tendermint-rpc = { workspace = true, features = ["http-client", "websocket-client", "default"] }
tokio = { workspace = true, features = ["full"] }
unionlabs = { workspace = true, features = ["near"] }

[lints]
workspace = true
Loading

0 comments on commit 94760bf

Please sign in to comment.