Merge branch 'main' of https://github.com/LibertyDSNP/frequency into …

…942-capacity-replace-currency-trait-with-fungible-trait

.github/workflows/common/codecov/action.yml

@@ -1,20 +1,59 @@
 name: Run Generation of Code Coverage
-description: Runs cargo llvm-cov
+description: Runs cargo grcov
+inputs:
+  code-cov-token:
+    description: "codecov token"
+    required: true
 runs:
   using: "composite"
   steps:
-    - name: Install cargo-llvm-cov
-      uses: taiki-e/install-action@cargo-llvm-cov
+    - name: Install grcov
+      shell: bash
+      run: cargo +nightly-2023-07-13 install grcov
+    - name: Build
+      shell: bash # Limited to 12 threads max
+      run: cargo +nightly-2023-07-13 build -j 12 --features frequency-lint-check
+      env:
+        CARGO_INCREMENTAL: '0'
+        RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort"
+        RUSTDOCFLAGS: "-Cpanic=abort"
+    - name: Test
+      shell: bash # Limited to 12 threads max
+      run: cargo +nightly-2023-07-13 test -j 12 --features frequency-lint-check
+      env:
+        CARGO_INCREMENTAL: '0'
+        RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort"
+        RUSTDOCFLAGS: "-Cpanic=abort"
+    # There are a lot of things ignored here to make it all work
+    # See the grcov docs for more information
+    # excl rpc traits, and error enums
+    # Only one of excl start and stop are allowed.
     - name: Generate code coverage
       shell: bash
       run: |
-        cargo llvm-cov -v --no-fail-fast --workspace --lcov --output-path lcov.info \
-        --ignore-filename-regex "^.*\/(node\/|runtime\/|mock\.rs|weights(\.rs)?|benchmarking\.rs|runtime-api/src/lib\.rs).*$" \
-        --exclude "frequency,frequency-cli,frequency-runtime,frequency-service" \
-        --features frequency-lint-check
+        grcov . -s . --binary-path ./target/debug/ -t lcov \
+          --ignore-not-existing \
+          --excl-start '(pub enum Error<T> \{|#\[rpc\()' \
+          --excl-stop '\s*}$' \
+          --ignore "target/*" \
+          --ignore "node/*"  \
+          --ignore "runtime/*" \
+          --ignore "**/*weights.rs" \
+          --ignore "**/benchmark*.rs" \
+          --ignore "**/*tests.rs" \
+          --ignore "**/tests/*.rs" \
+          --ignore "**/*mock.rs" \
+          --ignore "**/*runtime-api/src/lib.rs" \
+          --ignore "*github.com*" \
+          --ignore "*libcore*" \
+          --ignore "*rustc*" \
+          --ignore "*liballoc*" \
+          --ignore "*cargo*" \
+          -o ./target/debug/lcov.info
     - name: Upload to codecov.io
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4.0.0-beta.3
       with:
-        files: lcov.info
+        token: ${{inputs.code-cov-token}}
+        files: ./target/debug/lcov.info
         fail_ci_if_error: false # optional (default = false)
         verbose: true # optional (default = false)

.github/workflows/merge-pr.yml

@@ -64,16 +64,16 @@ jobs:
 
   calc-code-coverage:
     name: Merge - Calculate Code Coverage
-    # This job currently fails on EKS runners and must be run on standalone until
-    # https://www.pivotaltracker.com/story/show/185045668 is resolved.
-    runs-on: [self-hosted, Linux, X64, build, v1]
+    runs-on: [self-hosted, Linux, X64, build, v2]
     container: ghcr.io/libertydsnp/frequency/ci-base-image:1.0.0
     steps:
       - name: Check Out Repo
         uses: actions/checkout@v4
       - name: Generate and Upload Code Coverage
         id: codecov
         uses: ./.github/workflows/common/codecov
+        with:
+          code-cov-token: ${{ secrets.CODECOV_TOKEN }}
 
   publish-ci-base-image:
     needs: changes

.github/workflows/verify-pr-commit.yml

@@ -263,16 +263,16 @@ jobs:
     needs: changes
     if: needs.changes.outputs.rust == 'true'
     name: Calculate Code Coverage
-    # This job currently fails on EKS runners and must be run on standalone until
-    # https://www.pivotaltracker.com/story/show/185045668 is resolved.
-    runs-on: [self-hosted, Linux, X64, build, v1]
+    runs-on: [self-hosted, Linux, X64, build, v2]
     container: ghcr.io/libertydsnp/frequency/ci-base-image:1.0.0
     steps:
       - name: Check Out Repo
         uses: actions/checkout@v4
       - name: Generate and Upload Code Coverage
         id: codecov
         uses: ./.github/workflows/common/codecov
+        with:
+          code-cov-token: ${{ secrets.CODECOV_TOKEN }}
 
   # Workaround to handle skipped required check inside matrix
   # https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks

README.md

@@ -334,7 +334,7 @@ Please check out [the information here](./CONTRIBUTING.md).
 # Security Issue Reporting
 
 Do you know of an on-chain vulnerability (or possible one) that can lead to economic loss, privacy loss, or instability of the network?
-Please report it to [[email protected]](mailto:[email protected])
+Please report it by following the steps mentioned in [here](./SECURITY.md).
 
 # Additional Resources
 

SECURITY.md

@@ -0,0 +1,91 @@
+# Security Policy
+
+We appreciate the efforts of security researchers and the broader community in helping us maintain a
+secure environment for our users. If you discover a security vulnerability, we kindly request that
+you report it to us privately before disclosing it publicly. This allows us to address the issue
+promptly and protect our users.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report the vulnerability via [https://github.com/LibertyDSNP/frequency/security/advisories/new](https://github.com/LibertyDSNP/frequency/security/advisories/new).
+
+Alternatively, you can send email to [[email protected]](mailto:[email protected]).  If
+possible, encrypt your message with our PGP key; you can download it from [OpenGPG key server](https://keys.openpgp.org/vks/v1/by-fingerprint/0E50AE7CFD8195999CF45370B766E94411B9B734)
+or copy from below.
+
+You should receive a response within 48 hours. If for some reason you do not, please follow up via
+email to ensure we received your original message.
+
+## Report details
+Please include the requested information listed below (as much as you can provide) to help us better
+understand the nature and scope of the possible issue:
+
+- Your name and contact information
+- Description of the vulnerability
+- Attack scenario (if any)
+- Step-by-step instructions to reproduce the issue
+- Any other details
+
+**Reminder: This process is only for security related vulnerabilities and if this is a generic issue
+(no security implications) with Frequency or Polkadot-sdk or any other dependencies please open a
+regular GitHub issue.**
+
+
+## Plaintext PGP Key
+
+```
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=oBQV
+-----END PGP PUBLIC KEY BLOCK-----
+```

common/primitives/src/schema.rs

@@ -14,6 +14,9 @@ use utils::*;
 /// Schema Id is the unique identifier for a Schema
 pub type SchemaId = u16;
 
+/// Schema version number
+pub type SchemaVersion = u8;
+
 /// Types of modeling in which a message payload may be defined
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[derive(Copy, Clone, Encode, Decode, PartialEq, Debug, TypeInfo, Eq, MaxEncodedLen)]
@@ -130,6 +133,19 @@ impl SchemaSettings {
 }
 impl_codec_bitflags!(SchemaSettings, u16, SchemaSetting);
 
+/// RPC Response from a schema name query
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Clone, Encode, Decode, PartialEq, Debug, TypeInfo, Eq)]
+pub struct SchemaVersionResponse {
+	/// Schema name in following format: namespace.descriptor
+	#[cfg_attr(feature = "std", serde(with = "as_string"))]
+	pub schema_name: Vec<u8>,
+	/// The version for this schema
+	pub schema_version: SchemaVersion,
+	/// The unique identifier for this Schema
+	pub schema_id: SchemaId,
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;

e2e/scaffolding/extrinsicHelpers.ts

@@ -353,6 +353,29 @@ export class ExtrinsicHelper {
     );
   }
 
+  /** Schema v3 Extrinsics */
+  public static createSchemaV3(
+    keys: KeyringPair,
+    model: any,
+    modelType: 'AvroBinary' | 'Parquet',
+    payloadLocation: 'OnChain' | 'IPFS' | 'Itemized' | 'Paginated',
+    grant: ('AppendOnly' | 'SignatureRequired')[],
+    schemaNme: string | null
+  ) {
+    return new Extrinsic(
+      () =>
+        ExtrinsicHelper.api.tx.schemas.createSchemaV3(
+          JSON.stringify(model),
+          modelType,
+          payloadLocation,
+          grant,
+          schemaNme
+        ),
+      keys,
+      ExtrinsicHelper.api.events.schemas.SchemaCreated
+    );
+  }
+
   /** Generic Schema Extrinsics */
   public static createSchemaWithSettingsGov(
     keys: KeyringPair,
@@ -375,6 +398,30 @@ export class ExtrinsicHelper {
     );
   }
 
+  /** Generic Schema Extrinsics v2 */
+  public static createSchemaWithSettingsGovV2(
+    keys: KeyringPair,
+    model: any,
+    modelType: 'AvroBinary' | 'Parquet',
+    payloadLocation: 'OnChain' | 'IPFS' | 'Itemized' | 'Paginated',
+    grant: 'AppendOnly' | 'SignatureRequired',
+    schemaName: string | null
+  ) {
+    return new Extrinsic(
+      () =>
+        ExtrinsicHelper.api.tx.schemas.createSchemaViaGovernanceV2(
+          keys.publicKey,
+          JSON.stringify(model),
+          modelType,
+          payloadLocation,
+          [grant],
+          schemaName
+        ),
+      keys,
+      ExtrinsicHelper.api.events.schemas.SchemaCreated
+    );
+  }
+
   /** Get Schema RPC */
   public static getSchema(schemaId: u16): Promise<Option<SchemaResponse>> {
     return ExtrinsicHelper.apiPromise.rpc.schemas.getBySchemaId(schemaId);

e2e/scaffolding/helpers.ts

@@ -534,3 +534,20 @@ export async function assertAddNewKey(
   assertEvent(eventMap, 'system.ExtrinsicSuccess');
   assertEvent(eventMap, 'msa.PublicKeyAdded');
 }
+
+export function generateSchemaPartialName(length: number): string {
+  let result = '';
+  const characters = 'abcdefghijklmnopqrstuvwxyz-';
+  const charactersLength = characters.length;
+  let counter = 0;
+  while (counter < length) {
+    const randomChar = characters.charAt(Math.floor(Math.random() * charactersLength));
+    if ((counter == 0 || counter == length - 1) && randomChar === '-') {
+      // avoid creating invalid name
+      continue;
+    }
+    result += randomChar;
+    counter += 1;
+  }
+  return result;
+}