Fixes build & tests (#478)

* Some changes * More changes * Changes * Fixes * Some fixes * fix typo * Adds dart run * Revert * return to top dir * test
leonardocustodio · Jun 27, 2024 · 2b3416c · 2b3416c
1 parent 0754d5f
commit 2b3416c
Show file tree

Hide file tree

Showing 21 changed files with 66 additions and 28 deletions.
diff --git 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/**'
@@ -37,3 +41,7 @@
 "type: documentation":
 - changed-files:
   - any-glob-to-any-file: '**/*.md'
+
+"type: dependencies":
+- changed-files:
+  - any-glob-to-any-file: ['**/pubspec.yaml', '**/pubspec.lock', '**/pubspec_overrides.yaml']
diff --git 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'
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -52,19 +52,19 @@ 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
+        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:

diff --git 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/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.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/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
+    path: ../substrate_bip39
+  secp256k1_ecdsa:
+    path: ../secp256k1_ecdsa
+  sr25519:
+    path: ../sr25519
+  ss58:
+    path: ../ss58
diff --git 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_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.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_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/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/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';
diff --git 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
@@ -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
@@ -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/sr25519/pubspec_overrides.yaml 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
diff --git 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
@@ -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
@@ -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
@@ -1,8 +1,8 @@
 name: polkadart_workspace
 
 environment:
-  sdk: ">=3.0.1 <4.0.0"
+  sdk: ">=3.3.0 <4.0.0"
 
 dev_dependencies:
-  coverage: ^1.6.3
+  coverage: ^1.8.0
   melos: ^6.1.0