From 55410ef693a6676f5ef93dd753bfceb44839d15f Mon Sep 17 00:00:00 2001 From: "Muhammad-Jibril B.A. (Khalifa MBA)" Date: Tue, 13 Feb 2024 19:17:35 +0000 Subject: [PATCH] **move `submodules` into `blockchain` --- .../submodules}/predeploy-contracts/.editorconfig | 0 .../submodules}/predeploy-contracts/.gitignore | 0 .../submodules}/predeploy-contracts/CODE_OF_CONDUCT.md | 0 .../submodules}/predeploy-contracts/LICENSE | 0 .../submodules}/predeploy-contracts/README.md | 0 .../submodules}/predeploy-contracts/contracts/README.md | 0 .../submodules}/predeploy-contracts/contracts/dex/DEX.sol | 0 .../submodules}/predeploy-contracts/contracts/dex/IDEX.sol | 0 .../submodules}/predeploy-contracts/contracts/nft/NFT.sol | 0 .../submodules}/predeploy-contracts/contracts/oracle/IOracle.sol | 0 .../submodules}/predeploy-contracts/contracts/oracle/Oracle.sol | 0 .../submodules}/predeploy-contracts/contracts/package.json | 0 .../predeploy-contracts/contracts/schedule/ISchedule.sol | 0 .../predeploy-contracts/contracts/schedule/Schedule.sol | 0 .../predeploy-contracts/contracts/state_rent/IStateRent.sol | 0 .../predeploy-contracts/contracts/state_rent/StateRent.sol | 0 .../predeploy-contracts/contracts/test/Erc20DemoContract.sol | 0 .../predeploy-contracts/contracts/token/MultiCurrency.sol | 0 .../submodules}/predeploy-contracts/contracts/token/Token.sol | 0 .../submodules}/predeploy-contracts/contracts/utils/Address.d.ts | 0 .../submodules}/predeploy-contracts/contracts/utils/Address.js | 0 .../submodules}/predeploy-contracts/contracts/utils/Address.sol | 0 .../predeploy-contracts/contracts/utils/Migrations.sol | 0 .../predeploy-contracts/contracts/utils/SystemContract.sol | 0 .../submodules}/predeploy-contracts/example/.editorconfig | 0 .../submodules}/predeploy-contracts/example/.gitignore | 0 .../submodules}/predeploy-contracts/example/.rustfmt.toml | 0 .../submodules}/predeploy-contracts/example/CODE_OF_CONDUCT.md | 0 .../submodules}/predeploy-contracts/example/Cargo.dev.toml | 0 .../submodules}/predeploy-contracts/example/HEADER-MIT | 0 .../submodules}/predeploy-contracts/example/LICENSE.md | 0 .../submodules}/predeploy-contracts/example/Makefile | 0 .../submodules}/predeploy-contracts/example/README.md | 0 .../submodules}/predeploy-contracts/example/rust-toolchain.toml | 0 .../submodules}/predeploy-contracts/generate/generate.js | 0 .../predeploy-contracts/migrations/1_initial_migration.js | 0 .../submodules}/predeploy-contracts/package.json | 0 .../submodules}/predeploy-contracts/resources/address.js.hbs | 0 .../submodules}/predeploy-contracts/resources/address.sol.hbs | 0 .../submodules}/predeploy-contracts/resources/bytecodes.json | 0 .../submodules}/predeploy-contracts/resources/tokens.json | 0 .../predeploy-contracts/scripts/prepare-contracts-package.sh | 0 .../submodules}/predeploy-contracts/truffle-config.js | 0 .../submodules}/predeploy-contracts/yarn.lock | 0 submodules/EthicalDeFi | 1 - submodules/orml | 1 - 46 files changed, 2 deletions(-) rename {submodules => blockchain/submodules}/predeploy-contracts/.editorconfig (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/.gitignore (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/CODE_OF_CONDUCT.md (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/LICENSE (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/README.md (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/contracts/README.md (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/contracts/dex/DEX.sol (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/contracts/dex/IDEX.sol (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/contracts/nft/NFT.sol (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/contracts/oracle/IOracle.sol (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/contracts/oracle/Oracle.sol (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/contracts/package.json (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/contracts/schedule/ISchedule.sol (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/contracts/schedule/Schedule.sol (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/contracts/state_rent/IStateRent.sol (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/contracts/state_rent/StateRent.sol (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/contracts/test/Erc20DemoContract.sol (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/contracts/token/MultiCurrency.sol (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/contracts/token/Token.sol (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/contracts/utils/Address.d.ts (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/contracts/utils/Address.js (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/contracts/utils/Address.sol (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/contracts/utils/Migrations.sol (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/contracts/utils/SystemContract.sol (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/example/.editorconfig (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/example/.gitignore (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/example/.rustfmt.toml (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/example/CODE_OF_CONDUCT.md (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/example/Cargo.dev.toml (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/example/HEADER-MIT (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/example/LICENSE.md (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/example/Makefile (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/example/README.md (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/example/rust-toolchain.toml (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/generate/generate.js (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/migrations/1_initial_migration.js (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/package.json (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/resources/address.js.hbs (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/resources/address.sol.hbs (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/resources/bytecodes.json (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/resources/tokens.json (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/scripts/prepare-contracts-package.sh (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/truffle-config.js (100%) rename {submodules => blockchain/submodules}/predeploy-contracts/yarn.lock (100%) delete mode 160000 submodules/EthicalDeFi delete mode 160000 submodules/orml diff --git a/submodules/predeploy-contracts/.editorconfig b/blockchain/submodules/predeploy-contracts/.editorconfig similarity index 100% rename from submodules/predeploy-contracts/.editorconfig rename to blockchain/submodules/predeploy-contracts/.editorconfig diff --git a/submodules/predeploy-contracts/.gitignore b/blockchain/submodules/predeploy-contracts/.gitignore similarity index 100% rename from submodules/predeploy-contracts/.gitignore rename to blockchain/submodules/predeploy-contracts/.gitignore diff --git a/submodules/predeploy-contracts/CODE_OF_CONDUCT.md b/blockchain/submodules/predeploy-contracts/CODE_OF_CONDUCT.md similarity index 100% rename from submodules/predeploy-contracts/CODE_OF_CONDUCT.md rename to blockchain/submodules/predeploy-contracts/CODE_OF_CONDUCT.md diff --git a/submodules/predeploy-contracts/LICENSE b/blockchain/submodules/predeploy-contracts/LICENSE similarity index 100% rename from submodules/predeploy-contracts/LICENSE rename to blockchain/submodules/predeploy-contracts/LICENSE diff --git a/submodules/predeploy-contracts/README.md b/blockchain/submodules/predeploy-contracts/README.md similarity index 100% rename from submodules/predeploy-contracts/README.md rename to blockchain/submodules/predeploy-contracts/README.md diff --git a/submodules/predeploy-contracts/contracts/README.md b/blockchain/submodules/predeploy-contracts/contracts/README.md similarity index 100% rename from submodules/predeploy-contracts/contracts/README.md rename to blockchain/submodules/predeploy-contracts/contracts/README.md diff --git a/submodules/predeploy-contracts/contracts/dex/DEX.sol b/blockchain/submodules/predeploy-contracts/contracts/dex/DEX.sol similarity index 100% rename from submodules/predeploy-contracts/contracts/dex/DEX.sol rename to blockchain/submodules/predeploy-contracts/contracts/dex/DEX.sol diff --git a/submodules/predeploy-contracts/contracts/dex/IDEX.sol b/blockchain/submodules/predeploy-contracts/contracts/dex/IDEX.sol similarity index 100% rename from submodules/predeploy-contracts/contracts/dex/IDEX.sol rename to blockchain/submodules/predeploy-contracts/contracts/dex/IDEX.sol diff --git a/submodules/predeploy-contracts/contracts/nft/NFT.sol b/blockchain/submodules/predeploy-contracts/contracts/nft/NFT.sol similarity index 100% rename from submodules/predeploy-contracts/contracts/nft/NFT.sol rename to blockchain/submodules/predeploy-contracts/contracts/nft/NFT.sol diff --git a/submodules/predeploy-contracts/contracts/oracle/IOracle.sol b/blockchain/submodules/predeploy-contracts/contracts/oracle/IOracle.sol similarity index 100% rename from submodules/predeploy-contracts/contracts/oracle/IOracle.sol rename to blockchain/submodules/predeploy-contracts/contracts/oracle/IOracle.sol diff --git a/submodules/predeploy-contracts/contracts/oracle/Oracle.sol b/blockchain/submodules/predeploy-contracts/contracts/oracle/Oracle.sol similarity index 100% rename from submodules/predeploy-contracts/contracts/oracle/Oracle.sol rename to blockchain/submodules/predeploy-contracts/contracts/oracle/Oracle.sol diff --git a/submodules/predeploy-contracts/contracts/package.json b/blockchain/submodules/predeploy-contracts/contracts/package.json similarity index 100% rename from submodules/predeploy-contracts/contracts/package.json rename to blockchain/submodules/predeploy-contracts/contracts/package.json diff --git a/submodules/predeploy-contracts/contracts/schedule/ISchedule.sol b/blockchain/submodules/predeploy-contracts/contracts/schedule/ISchedule.sol similarity index 100% rename from submodules/predeploy-contracts/contracts/schedule/ISchedule.sol rename to blockchain/submodules/predeploy-contracts/contracts/schedule/ISchedule.sol diff --git a/submodules/predeploy-contracts/contracts/schedule/Schedule.sol b/blockchain/submodules/predeploy-contracts/contracts/schedule/Schedule.sol similarity index 100% rename from submodules/predeploy-contracts/contracts/schedule/Schedule.sol rename to blockchain/submodules/predeploy-contracts/contracts/schedule/Schedule.sol diff --git a/submodules/predeploy-contracts/contracts/state_rent/IStateRent.sol b/blockchain/submodules/predeploy-contracts/contracts/state_rent/IStateRent.sol similarity index 100% rename from submodules/predeploy-contracts/contracts/state_rent/IStateRent.sol rename to blockchain/submodules/predeploy-contracts/contracts/state_rent/IStateRent.sol diff --git a/submodules/predeploy-contracts/contracts/state_rent/StateRent.sol b/blockchain/submodules/predeploy-contracts/contracts/state_rent/StateRent.sol similarity index 100% rename from submodules/predeploy-contracts/contracts/state_rent/StateRent.sol rename to blockchain/submodules/predeploy-contracts/contracts/state_rent/StateRent.sol diff --git a/submodules/predeploy-contracts/contracts/test/Erc20DemoContract.sol b/blockchain/submodules/predeploy-contracts/contracts/test/Erc20DemoContract.sol similarity index 100% rename from submodules/predeploy-contracts/contracts/test/Erc20DemoContract.sol rename to blockchain/submodules/predeploy-contracts/contracts/test/Erc20DemoContract.sol diff --git a/submodules/predeploy-contracts/contracts/token/MultiCurrency.sol b/blockchain/submodules/predeploy-contracts/contracts/token/MultiCurrency.sol similarity index 100% rename from submodules/predeploy-contracts/contracts/token/MultiCurrency.sol rename to blockchain/submodules/predeploy-contracts/contracts/token/MultiCurrency.sol diff --git a/submodules/predeploy-contracts/contracts/token/Token.sol b/blockchain/submodules/predeploy-contracts/contracts/token/Token.sol similarity index 100% rename from submodules/predeploy-contracts/contracts/token/Token.sol rename to blockchain/submodules/predeploy-contracts/contracts/token/Token.sol diff --git a/submodules/predeploy-contracts/contracts/utils/Address.d.ts b/blockchain/submodules/predeploy-contracts/contracts/utils/Address.d.ts similarity index 100% rename from submodules/predeploy-contracts/contracts/utils/Address.d.ts rename to blockchain/submodules/predeploy-contracts/contracts/utils/Address.d.ts diff --git a/submodules/predeploy-contracts/contracts/utils/Address.js b/blockchain/submodules/predeploy-contracts/contracts/utils/Address.js similarity index 100% rename from submodules/predeploy-contracts/contracts/utils/Address.js rename to blockchain/submodules/predeploy-contracts/contracts/utils/Address.js diff --git a/submodules/predeploy-contracts/contracts/utils/Address.sol b/blockchain/submodules/predeploy-contracts/contracts/utils/Address.sol similarity index 100% rename from submodules/predeploy-contracts/contracts/utils/Address.sol rename to blockchain/submodules/predeploy-contracts/contracts/utils/Address.sol diff --git a/submodules/predeploy-contracts/contracts/utils/Migrations.sol b/blockchain/submodules/predeploy-contracts/contracts/utils/Migrations.sol similarity index 100% rename from submodules/predeploy-contracts/contracts/utils/Migrations.sol rename to blockchain/submodules/predeploy-contracts/contracts/utils/Migrations.sol diff --git a/submodules/predeploy-contracts/contracts/utils/SystemContract.sol b/blockchain/submodules/predeploy-contracts/contracts/utils/SystemContract.sol similarity index 100% rename from submodules/predeploy-contracts/contracts/utils/SystemContract.sol rename to blockchain/submodules/predeploy-contracts/contracts/utils/SystemContract.sol diff --git a/submodules/predeploy-contracts/example/.editorconfig b/blockchain/submodules/predeploy-contracts/example/.editorconfig similarity index 100% rename from submodules/predeploy-contracts/example/.editorconfig rename to blockchain/submodules/predeploy-contracts/example/.editorconfig diff --git a/submodules/predeploy-contracts/example/.gitignore b/blockchain/submodules/predeploy-contracts/example/.gitignore similarity index 100% rename from submodules/predeploy-contracts/example/.gitignore rename to blockchain/submodules/predeploy-contracts/example/.gitignore diff --git a/submodules/predeploy-contracts/example/.rustfmt.toml b/blockchain/submodules/predeploy-contracts/example/.rustfmt.toml similarity index 100% rename from submodules/predeploy-contracts/example/.rustfmt.toml rename to blockchain/submodules/predeploy-contracts/example/.rustfmt.toml diff --git a/submodules/predeploy-contracts/example/CODE_OF_CONDUCT.md b/blockchain/submodules/predeploy-contracts/example/CODE_OF_CONDUCT.md similarity index 100% rename from submodules/predeploy-contracts/example/CODE_OF_CONDUCT.md rename to blockchain/submodules/predeploy-contracts/example/CODE_OF_CONDUCT.md diff --git a/submodules/predeploy-contracts/example/Cargo.dev.toml b/blockchain/submodules/predeploy-contracts/example/Cargo.dev.toml similarity index 100% rename from submodules/predeploy-contracts/example/Cargo.dev.toml rename to blockchain/submodules/predeploy-contracts/example/Cargo.dev.toml diff --git a/submodules/predeploy-contracts/example/HEADER-MIT b/blockchain/submodules/predeploy-contracts/example/HEADER-MIT similarity index 100% rename from submodules/predeploy-contracts/example/HEADER-MIT rename to blockchain/submodules/predeploy-contracts/example/HEADER-MIT diff --git a/submodules/predeploy-contracts/example/LICENSE.md b/blockchain/submodules/predeploy-contracts/example/LICENSE.md similarity index 100% rename from submodules/predeploy-contracts/example/LICENSE.md rename to blockchain/submodules/predeploy-contracts/example/LICENSE.md diff --git a/submodules/predeploy-contracts/example/Makefile b/blockchain/submodules/predeploy-contracts/example/Makefile similarity index 100% rename from submodules/predeploy-contracts/example/Makefile rename to blockchain/submodules/predeploy-contracts/example/Makefile diff --git a/submodules/predeploy-contracts/example/README.md b/blockchain/submodules/predeploy-contracts/example/README.md similarity index 100% rename from submodules/predeploy-contracts/example/README.md rename to blockchain/submodules/predeploy-contracts/example/README.md diff --git a/submodules/predeploy-contracts/example/rust-toolchain.toml b/blockchain/submodules/predeploy-contracts/example/rust-toolchain.toml similarity index 100% rename from submodules/predeploy-contracts/example/rust-toolchain.toml rename to blockchain/submodules/predeploy-contracts/example/rust-toolchain.toml diff --git a/submodules/predeploy-contracts/generate/generate.js b/blockchain/submodules/predeploy-contracts/generate/generate.js similarity index 100% rename from submodules/predeploy-contracts/generate/generate.js rename to blockchain/submodules/predeploy-contracts/generate/generate.js diff --git a/submodules/predeploy-contracts/migrations/1_initial_migration.js b/blockchain/submodules/predeploy-contracts/migrations/1_initial_migration.js similarity index 100% rename from submodules/predeploy-contracts/migrations/1_initial_migration.js rename to blockchain/submodules/predeploy-contracts/migrations/1_initial_migration.js diff --git a/submodules/predeploy-contracts/package.json b/blockchain/submodules/predeploy-contracts/package.json similarity index 100% rename from submodules/predeploy-contracts/package.json rename to blockchain/submodules/predeploy-contracts/package.json diff --git a/submodules/predeploy-contracts/resources/address.js.hbs b/blockchain/submodules/predeploy-contracts/resources/address.js.hbs similarity index 100% rename from submodules/predeploy-contracts/resources/address.js.hbs rename to blockchain/submodules/predeploy-contracts/resources/address.js.hbs diff --git a/submodules/predeploy-contracts/resources/address.sol.hbs b/blockchain/submodules/predeploy-contracts/resources/address.sol.hbs similarity index 100% rename from submodules/predeploy-contracts/resources/address.sol.hbs rename to blockchain/submodules/predeploy-contracts/resources/address.sol.hbs diff --git a/submodules/predeploy-contracts/resources/bytecodes.json b/blockchain/submodules/predeploy-contracts/resources/bytecodes.json similarity index 100% rename from submodules/predeploy-contracts/resources/bytecodes.json rename to blockchain/submodules/predeploy-contracts/resources/bytecodes.json diff --git a/submodules/predeploy-contracts/resources/tokens.json b/blockchain/submodules/predeploy-contracts/resources/tokens.json similarity index 100% rename from submodules/predeploy-contracts/resources/tokens.json rename to blockchain/submodules/predeploy-contracts/resources/tokens.json diff --git a/submodules/predeploy-contracts/scripts/prepare-contracts-package.sh b/blockchain/submodules/predeploy-contracts/scripts/prepare-contracts-package.sh similarity index 100% rename from submodules/predeploy-contracts/scripts/prepare-contracts-package.sh rename to blockchain/submodules/predeploy-contracts/scripts/prepare-contracts-package.sh diff --git a/submodules/predeploy-contracts/truffle-config.js b/blockchain/submodules/predeploy-contracts/truffle-config.js similarity index 100% rename from submodules/predeploy-contracts/truffle-config.js rename to blockchain/submodules/predeploy-contracts/truffle-config.js diff --git a/submodules/predeploy-contracts/yarn.lock b/blockchain/submodules/predeploy-contracts/yarn.lock similarity index 100% rename from submodules/predeploy-contracts/yarn.lock rename to blockchain/submodules/predeploy-contracts/yarn.lock diff --git a/submodules/EthicalDeFi b/submodules/EthicalDeFi deleted file mode 160000 index aeaa253a9..000000000 --- a/submodules/EthicalDeFi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aeaa253a931da94e67bc086f3972b4735bd30e58 diff --git a/submodules/orml b/submodules/orml deleted file mode 160000 index 80aac21ae..000000000 --- a/submodules/orml +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 80aac21ae7afcb0714c908643eb23c83c2eee088