Merge branch 'main' into docker-enhancements

centrifuge · Jan 9, 2024 · fd3b4f8 · fd3b4f8
2 parents bca265a + fd2d786
commit fd3b4f8
Show file tree

Hide file tree

Showing 53 changed files with 1,376 additions and 1,364 deletions.
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -51,7 +51,7 @@ jobs:
 
       - name: Setup docker metadata
         id: meta
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 #v5
+        uses: docker/metadata-action@9dc751fe249ad99385a2583ee0d084c400eee04e #v5
         with:
           images: |
             ghcr.io/centrifuge/centrifuge-chain

diff --git a/.github/workflows/build-wasm.yml b/.github/workflows/build-wasm.yml
@@ -69,7 +69,7 @@ jobs:
       #       /srtool/build --save
 
       - name: Upload srtool report
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 #v3.1.3
+        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 #v4.0.0
         with:
           name: srtool-wasm-report.txt
           path: ./${{ matrix.package }}-srtool-wasm-report.json
@@ -83,7 +83,7 @@ jobs:
 
       - name: Setup - gcloud / gsutil
         if: ${{ steps.auth.outcome == 'success' }}
-        uses: google-github-actions/setup-gcloud@e30db14379863a8c79331b04a9969f4c1e225e0b # v1.1.1
+        uses: google-github-actions/setup-gcloud@5a5f7b85fca43e76e53463acaa9d408a03c98d3a # v2.0.1
 
       - name: Publish artifacts to GCS
         if: ${{ steps.auth.outcome == 'success' }}

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -46,7 +46,7 @@ jobs:
           echo "<meta http-equiv=\"refresh\" content=\"0; url=centrifuge_chain/index.html\">" \ > ./target/doc/index.html
 
       - name: Setup Pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v4
 
       - name: Fix permissions
         run: |
@@ -62,4 +62,4 @@ jobs:
       - name: Deploy Docs
         # if: github.ref == 'refs/heads/main'
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/run-benchmarks.yml b/.github/workflows/run-benchmarks.yml
@@ -36,7 +36,7 @@ jobs:
       - run: echo "NOW=$(date -u +%Y-%m-%d)" >> $GITHUB_ENV
 
       - name: Upload artifact
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 #v3.1.3
+        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 #v4.0.0
         with:
           name: ${{ matrix.runtimes }}-weights
           path: runtime/${{ matrix.runtimes }}/src/weights/
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,12 +32,11 @@ members = [
   "pallets/nft",
   "pallets/nft-sales",
   "pallets/oracle-feed",
-  "pallets/oracle-data-collection",
+  "pallets/oracle-collection",
   "pallets/order-book",
   "pallets/permissions",
   "pallets/pool-system",
   "pallets/pool-registry",
-  "pallets/data-collector",
   "pallets/restricted-tokens",
   "pallets/restricted-xtokens",
   "pallets/transfer-allowlist",
@@ -244,6 +243,7 @@ chainbridge = { git = "https://github.com/centrifuge/chainbridge-substrate.git",
 
 # Foss3
 mock-builder = { git = "https://github.com/foss3/runtime-pallet-library", branch = "polkadot-v0.9.43" }
+pallet-remarks = { git = "https://github.com/foss3/runtime-pallet-library", branch = "polkadot-v0.9.43", default-features = false }
 
 # Centrifuge pallets
 axelar-gateway-precompile = { path = "pallets/liquidity-pools-gateway/axelar-gateway-precompile", default-features = false }
@@ -255,7 +255,6 @@ pallet-claims = { path = "pallets/claims", default-features = false }
 pallet-collator-allowlist = { path = "pallets/collator-allowlist", default-features = false }
 pallet-crowdloan-claim = { path = "pallets/crowdloan-claim", default-features = false }
 pallet-crowdloan-reward = { path = "pallets/crowdloan-reward", default-features = false }
-pallet-data-collector = { path = "pallets/data-collector", default-features = false }
 pallet-ethereum-transaction = { path = "pallets/ethereum-transaction", default-features = false }
 pallet-fees = { path = "pallets/fees", default-features = false }
 pallet-foreign-investments = { path = "pallets/foreign-investments", default-features = false }
@@ -270,7 +269,7 @@ pallet-migration-manager = { path = "pallets/migration", default-features = fals
 pallet-nft = { path = "pallets/nft", default-features = false }
 pallet-nft-sales = { path = "pallets/nft-sales", default-features = false }
 pallet-oracle-feed = { path = "pallets/oracle-feed", default-features = false }
-pallet-oracle-data-collection = { path = "pallets/oracle-data-collection", default-features = false }
+pallet-oracle-collection = { path = "pallets/oracle-collection", default-features = false }
 pallet-order-book = { path = "pallets/order-book", default-features = false }
 pallet-permissions = { path = "pallets/permissions", default-features = false }
 pallet-pool-registry = { path = "pallets/pool-registry", default-features = false }
@@ -287,7 +286,7 @@ cfg-types = { path = "libs/types", default-features = false }
 cfg-utils = { path = "libs/utils", default-features = false }
 cfg-mocks = { path = "libs/mocks", default-features = false }
 
-# Centrifuge uuntimes
+# Centrifuge runtimes
 runtime-common = { path = "runtime/common", default-features = false }
 development-runtime = { path = "runtime/development", default-features = false }
 altair-runtime = { path = "runtime/altair", default-features = false }