Skip to content

Commit

Permalink
Merge branch 'main' into do-clean-up
Browse files Browse the repository at this point in the history
  • Loading branch information
osipov-mit committed Jan 17, 2025
2 parents b5e8349 + 32b2e11 commit 54355fb
Show file tree
Hide file tree
Showing 137 changed files with 7,194 additions and 24,397 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/CI-CD-k8s-gear-js-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,11 @@ jobs:
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-frontend:qa
build-args: |
VITE_NODE_ADDRESS=${{ secrets.REACT_APP_NODE_ADDRESS }}
VITE_API_URL=${{ secrets.REACT_APP_API_URL }}
VITE_DEFAULT_TRANSFER_BALANCE_VALUE=${{ secrets.REACT_APP_DEFAULT_TRANSFER_BALANCE_VALUE }}
VITE_HCAPTCHA_SITE_KEY=${{ secrets.REACT_APP_HCAPTCHA_SITE_KEY }}
VITE_NODES_API_URL= ${{ secrets.REACT_APP_DEFAULT_NODES_URL }}
VITE_FAUCET_API_URL= ${{ secrets.VITE_FAUCET_API_URL }}
VITE_METADATA_STORAGE_API_URL= ${{ secrets.VITE_METADATA_STORAGE_API_URL }}
VITE_MAINNET_VOUCHERS_API_URL=${{ secrets.VITE_MAINNET_VOUCHERS_API_URL }}
VITE_TESTNET_VOUCHERS_API_URL=${{ secrets.VITE_TESTNET_VOUCHERS_API_URL }}
VITE_INDEXER_API_URL=${{ secrets.VITE_INDEXER_API_URL }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/CI-CD-k8s-release-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,13 @@ jobs:
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-frontend:prod
build-args: |
VITE_NODE_ADDRESS=${{ secrets.REACT_APP_NODE_ADDRESS }}
VITE_API_URL=${{ secrets.REACT_APP_API_URL }}
VITE_DEFAULT_TRANSFER_BALANCE_VALUE=${{ secrets.REACT_APP_DEFAULT_TRANSFER_BALANCE_VALUE }}
VITE_HCAPTCHA_SITE_KEY=${{ secrets.REACT_APP_HCAPTCHA_SITE_KEY }}
VITE_NODES_API_URL=${{ secrets.REACT_APP_DEFAULT_NODES_URL }}
VITE_FAUCET_API_URL=${{ secrets.VITE_FAUCET_API_URL }}
VITE_METADATA_STORAGE_API_URL=${{ secrets.VITE_METADATA_STORAGE_API_URL }}
VITE_GTM_ID=${{ secrets.VITE_GTM_ID}}
VITE_INDEXER_API_URL=${{ secrets.VITE_INDEXER_API_URL }}
VITE_MAINNET_VOUCHERS_API_URL=${{ secrets.VITE_MAINNET_VOUCHERS_API_URL }}
VITE_TESTNET_VOUCHERS_API_URL=${{ secrets.VITE_TESTNET_VOUCHERS_API_URL }}
VITE_TESTNET_DNS_API_URL=${{ secrets.VITE_TESTNET_DNS_API_URL }}
Expand Down
9 changes: 8 additions & 1 deletion api/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
## 0.40.0
_28/11/2024

- Bump `@polkadot/*` dependencies to `15.0.1` in https://github.com/gear-tech/gear-js/pull/1677
- Remove `Buffer` type from everywhere in https://github.com/gear-tech/gear-js/pull/1677
- Remove `readState` function not used anymore in https://github.com/gear-tech/gear-js/pull/1677

## 0.39.0

_30/10/2024_
_27/11/2024_


### Changes
Expand Down
30 changes: 15 additions & 15 deletions api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gear-js/api",
"version": "0.39.0",
"version": "0.40.0",
"description": "A JavaScript library that provides functionality to connect GEAR Component APIs.",
"main": "cjs/index.js",
"module": "index.js",
Expand Down Expand Up @@ -48,38 +48,38 @@
},
"license": "GPL-3.0",
"peerDependencies": {
"@polkadot/api": "14.3.1",
"@polkadot/api": "15.0.1",
"@polkadot/wasm-crypto": "7.4.1",
"rxjs": "7.8.1"
},
"devDependencies": {
"@babel/plugin-transform-typescript": "7.25.9",
"@babel/preset-env": "7.26.0",
"@babel/preset-typescript": "7.26.0",
"@polkadot/api": "14.3.1",
"@polkadot/typegen": "14.3.1",
"@polkadot/types": "14.3.1",
"@polkadot/types-codec": "14.3.1",
"@polkadot/api": "15.0.1",
"@polkadot/typegen": "15.0.1",
"@polkadot/types": "15.0.1",
"@polkadot/types-codec": "15.0.1",
"@polkadot/wasm-crypto": "7.4.1",
"@rollup/plugin-commonjs": "26.0.1",
"@rollup/plugin-commonjs": "28.0.1",
"@rollup/plugin-json": "6.1.0",
"@rollup/plugin-node-resolve": "15.2.3",
"@rollup/plugin-typescript": "11.1.6",
"@types/jest": "29.5.12",
"@rollup/plugin-node-resolve": "15.3.0",
"@rollup/plugin-typescript": "12.1.1",
"@types/jest": "29.5.14",
"@types/rollup-plugin-peer-deps-external": "2.2.5",
"@typescript-eslint/parser": "8.0.0",
"@typescript-eslint/parser": "8.16.0",
"babel-cli": "6.26.0",
"babel-core": "6.26.3",
"babel-jest": "29.7.0",
"eslint": "9.8.0",
"eslint": "9.15.0",
"jest": "29.7.0",
"rollup": "4.19.2",
"rollup": "4.27.4",
"rollup-plugin-peer-deps-external": "2.2.4",
"rollup-plugin-typescript2": "0.36.0",
"rxjs": "7.8.1",
"ts-jest": "29.2.4",
"ts-jest": "29.2.5",
"ts-node": "10.9.2",
"typescript": "5.5.4"
"typescript": "5.7.2"
},
"lint-staged": {
"*.ts": [
Expand Down
44 changes: 6 additions & 38 deletions api/programs/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 2 additions & 7 deletions api/programs/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
[workspace]
resolver = "2"

members = ["test-gas", "test-waitlist", "test-meta", "empty"]

[profile.release]
lto = true
opt-level = 's'
members = ["test-meta", 'test']

[workspace.dependencies]
gmeta = { git = "https://github.com/gear-tech/gear.git" }
gstd = { git = "https://github.com/gear-tech/gear.git" }
scale-info = { version = "2.11.0", default-features = false, features = [
"derive",
Expand All @@ -19,5 +16,3 @@ codec = { package = "parity-scale-codec", version = "3.6.9", default-features =
gear-wasm-builder = { git = "https://github.com/gear-tech/gear.git", features = [
"metawasm",
] }
gmeta = { git = "https://github.com/gear-tech/gear.git" }
primitive-types = { version = "0.12.2", default-features = false }
8 changes: 0 additions & 8 deletions api/programs/empty/src/lib.rs

This file was deleted.

15 changes: 0 additions & 15 deletions api/programs/test-gas/Cargo.toml

This file was deleted.

5 changes: 0 additions & 5 deletions api/programs/test-gas/build.rs

This file was deleted.

10 changes: 0 additions & 10 deletions api/programs/test-gas/io/Cargo.toml

This file was deleted.

25 changes: 0 additions & 25 deletions api/programs/test-gas/io/src/lib.rs

This file was deleted.

30 changes: 0 additions & 30 deletions api/programs/test-gas/src/lib.rs

This file was deleted.

30 changes: 0 additions & 30 deletions api/programs/test-gas/src/wasm.rs

This file was deleted.

7 changes: 2 additions & 5 deletions api/programs/test-meta/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,16 @@ name = "test-meta"
version = "0.1.0"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
gstd.workspace = true
scale-info.workspace = true
codec.workspace = true
test-meta-io = { path = "io" }
test-io = { path = "io" }
test-meta-state-v1 = { path = "state-v1", default-features = false, optional = true }
test-meta-state-v2 = { path = "state-v2", default-features = false, optional = true }

[build-dependencies]
test-meta-io = { path = "io" }
gear-wasm-builder.workspace = true
test-io = { path = "io" }

[features]
default = ["std"]
Expand Down
20 changes: 1 addition & 19 deletions api/programs/test-meta/build.rs
Original file line number Diff line number Diff line change
@@ -1,22 +1,4 @@
// This file is part of Gear.

// Copyright (C) 2021-2022 Gear Technologies Inc.
// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0

// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.

// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.

use test_meta_io::ProgramMetadata;
use test_io::ProgramMetadata;

fn main() {
gear_wasm_builder::build_with_metadata::<ProgramMetadata>();
Expand Down
Loading

0 comments on commit 54355fb

Please sign in to comment.