From 1022d2786ba7e736987ab28a4d86213f13ad430c Mon Sep 17 00:00:00 2001 From: Leonardo Custodio Date: Thu, 27 Jun 2024 14:46:13 -0300 Subject: [PATCH 01/10] Some changes --- .github/labeler.yml | 4 ++++ pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 259d5a5a..322be982 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -37,3 +37,7 @@ "type: documentation": - changed-files: - any-glob-to-any-file: '**/*.md' + +"type: dependencies": + - changed-files: + - any-glob-to-any-file: ['**/pubspec.yaml', '**/pubspec.lock'] diff --git a/pubspec.yaml b/pubspec.yaml index 7bfab373..c26d8fa9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,5 +4,5 @@ environment: sdk: ">=3.0.1 <4.0.0" dev_dependencies: - coverage: ^1.6.3 + coverage: ^1.8.0 melos: ^6.1.0 From 3af917a455447b4e8a9acf36c20a74bbc79d22cd Mon Sep 17 00:00:00 2001 From: Leonardo Custodio Date: Thu, 27 Jun 2024 14:51:43 -0300 Subject: [PATCH 02/10] More changes --- .github/labeler.yml | 8 ++++++-- .github/workflows/labeler.yml | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 322be982..846bc37b 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,3 +1,7 @@ +github-actions: +- changed-files: + - any-glob-to-any-file: '.github/**' + "pkg: polkadart": - changed-files: - any-glob-to-any-file: 'packages/polkadart/**' @@ -39,5 +43,5 @@ - any-glob-to-any-file: '**/*.md' "type: dependencies": - - changed-files: - - any-glob-to-any-file: ['**/pubspec.yaml', '**/pubspec.lock'] +- changed-files: + - any-glob-to-any-file: ['**/pubspec.yaml', '**/pubspec.lock'] diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index e57cd86e..fd25da11 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -10,3 +10,5 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/labeler@v5 + with: + configuration-path: '.github/labeler.yml' From 567544d6146a02b9584ddc797ff31f195088fb7e Mon Sep 17 00:00:00 2001 From: Leonardo Custodio Date: Thu, 27 Jun 2024 15:01:41 -0300 Subject: [PATCH 03/10] Changes --- .github/labeler.yml | 2 +- packages/polkadart/pubspec.yaml | 2 +- packages/polkadart_cli/pubspec.yaml | 2 +- packages/polkadart_keyring/pubspec.yaml | 2 +- packages/polkadart_scale_codec/lib/io/input.dart | 6 +++--- packages/polkadart_scale_codec/pubspec.yaml | 2 +- packages/secp256k1_ecdsa/pubspec.yaml | 2 +- packages/sr25519/pubspec.yaml | 2 +- packages/ss58/pubspec.yaml | 2 +- packages/substrate_bip39/pubspec.yaml | 2 +- packages/substrate_metadata/pubspec.yaml | 2 +- pubspec.yaml | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 846bc37b..4937eb9e 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -44,4 +44,4 @@ github-actions: "type: dependencies": - changed-files: - - any-glob-to-any-file: ['**/pubspec.yaml', '**/pubspec.lock'] + - any-glob-to-any-file: ['**/pubspec.yaml', '**/pubspec.lock', '**/pubspec_overrides.yaml'] diff --git a/packages/polkadart/pubspec.yaml b/packages/polkadart/pubspec.yaml index 9d94a53f..f8a45484 100644 --- a/packages/polkadart/pubspec.yaml +++ b/packages/polkadart/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/leonardocustodio/polkadart/tree/main/packages/polka repository: https://github.com/leonardocustodio/polkadart environment: - sdk: ">=3.0.1 <4.0.0" + sdk: ">=3.3.0 <4.0.0" dependencies: convert: ^3.1.1 # BSD-3-Clause diff --git a/packages/polkadart_cli/pubspec.yaml b/packages/polkadart_cli/pubspec.yaml index 905b05b7..9bb30e02 100644 --- a/packages/polkadart_cli/pubspec.yaml +++ b/packages/polkadart_cli/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/leonardocustodio/polkadart/tree/main/packages/polka repository: https://github.com/leonardocustodio/polkadart environment: - sdk: ">=3.0.1 <4.0.0" + sdk: ">=3.3.0 <4.0.0" dependencies: args: ^2.4.0 # BSD-3-Clause diff --git a/packages/polkadart_keyring/pubspec.yaml b/packages/polkadart_keyring/pubspec.yaml index 5d6c4318..342b919d 100644 --- a/packages/polkadart_keyring/pubspec.yaml +++ b/packages/polkadart_keyring/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/leonardocustodio/polkadart/tree/main/packages/polka repository: https://github.com/leonardocustodio/polkadart environment: - sdk: ">=3.0.1 <4.0.0" + sdk: ">=3.3.0 <4.0.0" dependencies: pointycastle: ^3.6.2 diff --git a/packages/polkadart_scale_codec/lib/io/input.dart b/packages/polkadart_scale_codec/lib/io/input.dart index fbed709e..c6494f54 100644 --- a/packages/polkadart_scale_codec/lib/io/input.dart +++ b/packages/polkadart_scale_codec/lib/io/input.dart @@ -42,7 +42,7 @@ mixin Input { /// final input = Input.fromHex('0x010203'); /// print(input.readBytes(3)); // [1, 2, 3] /// ``` - UnmodifiableUint8ListView readBytes(int length); + Uint8List readBytes(int length); /// /// returns true if there are bytes left to be read @@ -108,12 +108,12 @@ class ByteInput with Input { } @override - UnmodifiableUint8ListView readBytes(int length) { + Uint8List readBytes(int length) { if ((offset + length) > _buffer.length) { throw Exception('Not enough bytes to read'); } final bytes = - UnmodifiableUint8ListView(_buffer.buffer.asUint8List(offset, length)); + _buffer.buffer.asUint8List(offset, length).asUnmodifiableView(); offset += length; return bytes; } diff --git a/packages/polkadart_scale_codec/pubspec.yaml b/packages/polkadart_scale_codec/pubspec.yaml index 72fdd8df..4815f0af 100644 --- a/packages/polkadart_scale_codec/pubspec.yaml +++ b/packages/polkadart_scale_codec/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/leonardocustodio/polkadart/tree/main/packages/polka repository: https://github.com/leonardocustodio/polkadart environment: - sdk: ">=3.0.1 <4.0.0" + sdk: ">=3.3.0 <4.0.0" dependencies: convert: ^3.0.2 # BSD-3-Clause diff --git a/packages/secp256k1_ecdsa/pubspec.yaml b/packages/secp256k1_ecdsa/pubspec.yaml index b0417396..a0c50c13 100644 --- a/packages/secp256k1_ecdsa/pubspec.yaml +++ b/packages/secp256k1_ecdsa/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/leonardocustodio/polkadart/tree/main/packages/secp2 repository: https://github.com/leonardocustodio/polkadart environment: - sdk: ">=3.0.1 <4.0.0" + sdk: ">=3.3.0 <4.0.0" dependencies: pointycastle: ^3.7.4 diff --git a/packages/sr25519/pubspec.yaml b/packages/sr25519/pubspec.yaml index 19d226d3..8cc7f429 100644 --- a/packages/sr25519/pubspec.yaml +++ b/packages/sr25519/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/leonardocustodio/polkadart/tree/main/packages/sr255 repository: https://github.com/leonardocustodio/polkadart environment: - sdk: ">=3.0.1 <4.0.0" + sdk: ">=3.3.0 <4.0.0" dependencies: collection: ^1.18.0 diff --git a/packages/ss58/pubspec.yaml b/packages/ss58/pubspec.yaml index 2dbc4cc1..384b0598 100644 --- a/packages/ss58/pubspec.yaml +++ b/packages/ss58/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/leonardocustodio/polkadart/tree/main/packages/ss58 repository: https://github.com/leonardocustodio/polkadart environment: - sdk: ">=3.0.1 <4.0.0" + sdk: ">=3.3.0 <4.0.0" dependencies: equatable: ^2.0.5 # MIT diff --git a/packages/substrate_bip39/pubspec.yaml b/packages/substrate_bip39/pubspec.yaml index 86d0bd23..020cb0d3 100644 --- a/packages/substrate_bip39/pubspec.yaml +++ b/packages/substrate_bip39/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/leonardocustodio/polkadart/tree/main/packages/subst repository: https://github.com/leonardocustodio/polkadart environment: - sdk: ">=3.0.1 <4.0.0" + sdk: ">=3.3.0 <4.0.0" dependencies: bip39_mnemonic: ^3.0.6 diff --git a/packages/substrate_metadata/pubspec.yaml b/packages/substrate_metadata/pubspec.yaml index 7229f1f7..70b1f5c8 100644 --- a/packages/substrate_metadata/pubspec.yaml +++ b/packages/substrate_metadata/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/rankanizer/polkadart/tree/main/packages/substrate_m repository: https://github.com/rankanizer/polkadart environment: - sdk: ">=3.0.1 <4.0.0" + sdk: ">=3.3.0 <4.0.0" dependencies: equatable: ^2.0.5 diff --git a/pubspec.yaml b/pubspec.yaml index c26d8fa9..19fe4cb5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: polkadart_workspace environment: - sdk: ">=3.0.1 <4.0.0" + sdk: ">=3.3.0 <4.0.0" dev_dependencies: coverage: ^1.8.0 From 2d6dc0a94a14b6213714ebad728ccc094badb8c7 Mon Sep 17 00:00:00 2001 From: Leonardo Custodio Date: Thu, 27 Jun 2024 15:08:56 -0300 Subject: [PATCH 04/10] Fixes --- examples/pubspec.yaml | 6 +++--- packages/polkadart_scale_codec/lib/io/io.dart | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/examples/pubspec.yaml b/examples/pubspec.yaml index 8f47c621..188b8df9 100644 --- a/examples/pubspec.yaml +++ b/examples/pubspec.yaml @@ -9,9 +9,9 @@ environment: # Add regular dependencies here. dependencies: convert: ^3.1.1 - polkadart: ^0.4.2 - polkadart_cli: ^0.4.1 - polkadart_keyring: ^0.4.2 + polkadart: ^0.4.6 + polkadart_cli: ^0.4.2 + polkadart_keyring: ^0.4.3 polkadart_scale_codec: ^1.2.0 ss58: ^1.1.2 substrate_bip39: ^0.4.0 diff --git a/packages/polkadart_scale_codec/lib/io/io.dart b/packages/polkadart_scale_codec/lib/io/io.dart index 4a4a25e2..2bae4642 100644 --- a/packages/polkadart_scale_codec/lib/io/io.dart +++ b/packages/polkadart_scale_codec/lib/io/io.dart @@ -1,13 +1,14 @@ library io; -import 'dart:typed_data' show Uint8List, UnmodifiableUint8ListView; +import 'dart:typed_data' show Uint8List; + import 'package:typed_data/typed_buffers.dart'; import '../utils/utils.dart' show encodeHex, decodeHex; part './byte_output.dart'; +part './generator_output.dart'; part './hex_output.dart'; part './input.dart'; part './output.dart'; part './size_tracker.dart'; -part './generator_output.dart'; From 4a8a29b136961211c8738afa8ac0fd5112e4a40e Mon Sep 17 00:00:00 2001 From: Leonardo Custodio Date: Thu, 27 Jun 2024 15:17:15 -0300 Subject: [PATCH 05/10] Some fixes --- .github/workflows/tests.yml | 8 ++++---- examples/pubspec_overrides.yaml | 4 +++- packages/polkadart/pubspec_overrides.yaml | 9 ++++++++- packages/polkadart_cli/pubspec_overrides.yaml | 12 +++++++++++- packages/polkadart_keyring/pubspec_overrides.yaml | 4 +++- packages/sr25519/pubspec_overrides.yaml | 6 ++++++ 6 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 packages/sr25519/pubspec_overrides.yaml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 53b53ce5..b296924c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -55,16 +55,16 @@ jobs: run: cd examples && dart run polkadart_cli:generate -v - name: Check format - run: SCOPE="${{ matrix.package }}" dart run melos format + run: melos exec --scope="${{ matrix.package }}" -- dart run format - name: Analyze - run: SCOPE="${{ matrix.package }}" dart run melos analyze + run: melos exec --scope="${{ matrix.package }}" -- dart run analyze - name: Run tests - run: SCOPE="${{ matrix.package }}" dart run melos test + run: Smelos exec --scope="${{ matrix.package }}" -- dart run test - name: Run format coverage - run: SCOPE="${{ matrix.package }}" dart run melos coverage + run: melos exec --scope="${{ matrix.package }}" -- dart run coverage - uses: codecov/codecov-action@v4 with: diff --git a/examples/pubspec_overrides.yaml b/examples/pubspec_overrides.yaml index 053e4d25..97289d4b 100644 --- a/examples/pubspec_overrides.yaml +++ b/examples/pubspec_overrides.yaml @@ -1,4 +1,4 @@ -# melos_managed_dependency_overrides: polkadart,polkadart_cli,polkadart_keyring,polkadart_scale_codec,ss58,substrate_bip39,substrate_metadata +# melos_managed_dependency_overrides: polkadart,polkadart_cli,polkadart_keyring,polkadart_scale_codec,ss58,substrate_bip39,substrate_metadata,sr25519 dependency_overrides: polkadart: path: ../packages/polkadart @@ -16,3 +16,5 @@ dependency_overrides: path: ../packages/substrate_bip39 substrate_metadata: path: ../packages/substrate_metadata + sr25519: + path: ../packages/sr25519 diff --git a/packages/polkadart/pubspec_overrides.yaml b/packages/polkadart/pubspec_overrides.yaml index 7e916a1d..9b269a8e 100644 --- a/packages/polkadart/pubspec_overrides.yaml +++ b/packages/polkadart/pubspec_overrides.yaml @@ -1,3 +1,4 @@ +# melos_managed_dependency_overrides: secp256k1_ecdsa,sr25519,ss58 # melos_managed_dependency_overrides dependency_overrides: polkadart_scale_codec: @@ -7,4 +8,10 @@ dependency_overrides: polkadart_keyring: path: ../polkadart_keyring substrate_bip39: - path: ../substrate_bip39 \ No newline at end of file + path: ../substrate_bip39 + secp256k1_ecdsa: + path: ../secp256k1_ecdsa + sr25519: + path: ../sr25519 + ss58: + path: ../ss58 diff --git a/packages/polkadart_cli/pubspec_overrides.yaml b/packages/polkadart_cli/pubspec_overrides.yaml index 380ddaeb..d2d8b841 100644 --- a/packages/polkadart_cli/pubspec_overrides.yaml +++ b/packages/polkadart_cli/pubspec_overrides.yaml @@ -1,8 +1,18 @@ -# melos_managed_dependency_overrides: polkadart_scale_codec,substrate_metadata +# melos_managed_dependency_overrides: polkadart_scale_codec,substrate_metadata,polkadart_keyring,secp256k1_ecdsa,sr25519,ss58,substrate_bip39 dependency_overrides: polkadart: path: ../polkadart + polkadart_keyring: + path: ../polkadart_keyring polkadart_scale_codec: path: ../polkadart_scale_codec + secp256k1_ecdsa: + path: ../secp256k1_ecdsa + sr25519: + path: ../sr25519 + ss58: + path: ../ss58 + substrate_bip39: + path: ../substrate_bip39 substrate_metadata: path: ../substrate_metadata diff --git a/packages/polkadart_keyring/pubspec_overrides.yaml b/packages/polkadart_keyring/pubspec_overrides.yaml index 7b8767ef..a63848cb 100644 --- a/packages/polkadart_keyring/pubspec_overrides.yaml +++ b/packages/polkadart_keyring/pubspec_overrides.yaml @@ -1,4 +1,4 @@ -# melos_managed_dependency_overrides: polkadart_scale_codec,ss58 +# melos_managed_dependency_overrides: polkadart_scale_codec,ss58,sr25519 # melos_managed_dependency_overrides dependency_overrides: polkadart_scale_codec: @@ -9,3 +9,5 @@ dependency_overrides: path: ../substrate_bip39 secp256k1_ecdsa: path: ../secp256k1_ecdsa + sr25519: + path: ../sr25519 diff --git a/packages/sr25519/pubspec_overrides.yaml b/packages/sr25519/pubspec_overrides.yaml new file mode 100644 index 00000000..5c65e363 --- /dev/null +++ b/packages/sr25519/pubspec_overrides.yaml @@ -0,0 +1,6 @@ +# melos_managed_dependency_overrides: polkadart_scale_codec,substrate_bip39 +dependency_overrides: + polkadart_scale_codec: + path: ../polkadart_scale_codec + substrate_bip39: + path: ../substrate_bip39 From 409c159220cf6b1c979d3912dd830ab0d59b7f49 Mon Sep 17 00:00:00 2001 From: Leonardo Custodio Date: Thu, 27 Jun 2024 15:17:51 -0300 Subject: [PATCH 06/10] fix typo --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b296924c..a15ee1ee 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -61,7 +61,7 @@ jobs: run: melos exec --scope="${{ matrix.package }}" -- dart run analyze - name: Run tests - run: Smelos exec --scope="${{ matrix.package }}" -- dart run test + run: melos exec --scope="${{ matrix.package }}" -- dart run test - name: Run format coverage run: melos exec --scope="${{ matrix.package }}" -- dart run coverage From ce51d5d348943e4f0dd9f2008770be98f99617c0 Mon Sep 17 00:00:00 2001 From: Leonardo Custodio Date: Thu, 27 Jun 2024 15:20:43 -0300 Subject: [PATCH 07/10] Adds dart run --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a15ee1ee..2c0442b2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -55,16 +55,16 @@ jobs: run: cd examples && dart run polkadart_cli:generate -v - name: Check format - run: melos exec --scope="${{ matrix.package }}" -- dart run format + run: dart run melos exec --scope="${{ matrix.package }}" -- dart run format - name: Analyze - run: melos exec --scope="${{ matrix.package }}" -- dart run analyze + run: dart run melos exec --scope="${{ matrix.package }}" -- dart run analyze - name: Run tests - run: melos exec --scope="${{ matrix.package }}" -- dart run test + run: dart run melos exec --scope="${{ matrix.package }}" -- dart run test - name: Run format coverage - run: melos exec --scope="${{ matrix.package }}" -- dart run coverage + run: dart run melos exec --scope="${{ matrix.package }}" -- dart run coverage - uses: codecov/codecov-action@v4 with: From 504f64836d1a4fd7b3ca1aebfe55ea3e1b143358 Mon Sep 17 00:00:00 2001 From: Leonardo Custodio Date: Thu, 27 Jun 2024 15:28:08 -0300 Subject: [PATCH 08/10] Revert --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2c0442b2..53b53ce5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -55,16 +55,16 @@ jobs: run: cd examples && dart run polkadart_cli:generate -v - name: Check format - run: dart run melos exec --scope="${{ matrix.package }}" -- dart run format + run: SCOPE="${{ matrix.package }}" dart run melos format - name: Analyze - run: dart run melos exec --scope="${{ matrix.package }}" -- dart run analyze + run: SCOPE="${{ matrix.package }}" dart run melos analyze - name: Run tests - run: dart run melos exec --scope="${{ matrix.package }}" -- dart run test + run: SCOPE="${{ matrix.package }}" dart run melos test - name: Run format coverage - run: dart run melos exec --scope="${{ matrix.package }}" -- dart run coverage + run: SCOPE="${{ matrix.package }}" dart run melos coverage - uses: codecov/codecov-action@v4 with: From 93562e18f5187ab36c78fdb904d3ad38bd7ee3bd Mon Sep 17 00:00:00 2001 From: Leonardo Custodio Date: Thu, 27 Jun 2024 15:32:08 -0300 Subject: [PATCH 09/10] return to top dir --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 53b53ce5..0976e9b7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -52,7 +52,7 @@ jobs: - name: Generate Files for polkadart_example if: ${{ matrix.package == 'polkadart_example' }} - run: cd examples && dart run polkadart_cli:generate -v + run: cd examples && dart run polkadart_cli:generate -v && cd .. - name: Check format run: SCOPE="${{ matrix.package }}" dart run melos format From 09acd0addb01879c637ee7673f1b5423728107f3 Mon Sep 17 00:00:00 2001 From: Leonardo Custodio Date: Thu, 27 Jun 2024 15:38:57 -0300 Subject: [PATCH 10/10] test --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0976e9b7..b604d055 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -55,16 +55,16 @@ jobs: run: cd examples && dart run polkadart_cli:generate -v && cd .. - name: Check format - run: SCOPE="${{ matrix.package }}" dart run melos format + run: SCOPE="${{ matrix.package }}" dart run melos run format - name: Analyze - run: SCOPE="${{ matrix.package }}" dart run melos analyze + run: SCOPE="${{ matrix.package }}" dart run melos run analyze - name: Run tests - run: SCOPE="${{ matrix.package }}" dart run melos test + run: SCOPE="${{ matrix.package }}" dart run melos run test - name: Run format coverage - run: SCOPE="${{ matrix.package }}" dart run melos coverage + run: SCOPE="${{ matrix.package }}" dart run melos run coverage - uses: codecov/codecov-action@v4 with: