diff --git a/.gitmodules b/.gitmodules index eec84be25..11fa5b8c4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,3 @@ -[submodule "predeploy-contracts"] - path = blockchain/submodules/predeploy-contracts - url = https://github.com/Setheum-Labs/predeploy-contracts.git - [submodule "orml"] path = orml url = https://github.com/Slixon-Technologies/open-runtime-module-library.git diff --git a/Makefile b/Makefile index 15f0c4b16..d6cbf97e9 100644 --- a/Makefile +++ b/Makefile @@ -125,4 +125,4 @@ endif .PHONY: generate-tokens generate-tokens: cargo test -p setheum-primitives -- --ignored - cd blockchain/submodules/predeploy-contracts && yarn && yarn run generate-bytecode + cd blockchain/predeploy-contracts && yarn && yarn run generate-bytecode diff --git a/README.md b/README.md index b5f1ce41b..3549be96a 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,7 @@ sudo apt-get install -y git make clang curl pkg-config libssl-dev llvm libudev-d You may need additional dependencies, checkout [substrate.io](https://docs.substrate.io/v3/getting-started/installation) for more info. -Make sure you have `submodule.recurse` set to true to configure submodules. +Make sure you have `submodule.recurse` set to true to ease submodule use. ```bash git config --global submodule.recurse true @@ -210,12 +210,6 @@ Update Cargo: make update ``` -Update Submodules: - -```bash -make update-submodules -``` - Update ORML: ```bash @@ -224,14 +218,6 @@ git add orml cargo update check-all ``` -Update Predeploy-Contracts: - -```bash -cd blockchain/submodules/predeploy-contracts && git checkout master && git pull -git add predeploy-contracts -cargo update check-all -``` - __Note:__ All build command from Makefile are designed for local development purposes and hence have `SKIP_WASM_BUILD` enabled to speed up build time and use `--execution native` to only run using native execution mode. ## 4.0. Nodes diff --git a/blockchain/submodules/predeploy-contracts/.editorconfig b/blockchain/predeploy-contracts/.editorconfig similarity index 100% rename from blockchain/submodules/predeploy-contracts/.editorconfig rename to blockchain/predeploy-contracts/.editorconfig diff --git a/blockchain/submodules/predeploy-contracts/.gitignore b/blockchain/predeploy-contracts/.gitignore similarity index 100% rename from blockchain/submodules/predeploy-contracts/.gitignore rename to blockchain/predeploy-contracts/.gitignore diff --git a/blockchain/submodules/predeploy-contracts/CODE_OF_CONDUCT.md b/blockchain/predeploy-contracts/CODE_OF_CONDUCT.md similarity index 100% rename from blockchain/submodules/predeploy-contracts/CODE_OF_CONDUCT.md rename to blockchain/predeploy-contracts/CODE_OF_CONDUCT.md diff --git a/blockchain/submodules/predeploy-contracts/LICENSE b/blockchain/predeploy-contracts/LICENSE similarity index 100% rename from blockchain/submodules/predeploy-contracts/LICENSE rename to blockchain/predeploy-contracts/LICENSE diff --git a/blockchain/submodules/predeploy-contracts/README.md b/blockchain/predeploy-contracts/README.md similarity index 100% rename from blockchain/submodules/predeploy-contracts/README.md rename to blockchain/predeploy-contracts/README.md diff --git a/blockchain/submodules/predeploy-contracts/contracts/README.md b/blockchain/predeploy-contracts/contracts/README.md similarity index 100% rename from blockchain/submodules/predeploy-contracts/contracts/README.md rename to blockchain/predeploy-contracts/contracts/README.md diff --git a/blockchain/submodules/predeploy-contracts/contracts/dex/DEX.sol b/blockchain/predeploy-contracts/contracts/dex/DEX.sol similarity index 100% rename from blockchain/submodules/predeploy-contracts/contracts/dex/DEX.sol rename to blockchain/predeploy-contracts/contracts/dex/DEX.sol diff --git a/blockchain/submodules/predeploy-contracts/contracts/dex/IDEX.sol b/blockchain/predeploy-contracts/contracts/dex/IDEX.sol similarity index 100% rename from blockchain/submodules/predeploy-contracts/contracts/dex/IDEX.sol rename to blockchain/predeploy-contracts/contracts/dex/IDEX.sol diff --git a/blockchain/submodules/predeploy-contracts/contracts/nft/NFT.sol b/blockchain/predeploy-contracts/contracts/nft/NFT.sol similarity index 100% rename from blockchain/submodules/predeploy-contracts/contracts/nft/NFT.sol rename to blockchain/predeploy-contracts/contracts/nft/NFT.sol diff --git a/blockchain/submodules/predeploy-contracts/contracts/oracle/IOracle.sol b/blockchain/predeploy-contracts/contracts/oracle/IOracle.sol similarity index 100% rename from blockchain/submodules/predeploy-contracts/contracts/oracle/IOracle.sol rename to blockchain/predeploy-contracts/contracts/oracle/IOracle.sol diff --git a/blockchain/submodules/predeploy-contracts/contracts/oracle/Oracle.sol b/blockchain/predeploy-contracts/contracts/oracle/Oracle.sol similarity index 100% rename from blockchain/submodules/predeploy-contracts/contracts/oracle/Oracle.sol rename to blockchain/predeploy-contracts/contracts/oracle/Oracle.sol diff --git a/blockchain/submodules/predeploy-contracts/contracts/package.json b/blockchain/predeploy-contracts/contracts/package.json similarity index 100% rename from blockchain/submodules/predeploy-contracts/contracts/package.json rename to blockchain/predeploy-contracts/contracts/package.json diff --git a/blockchain/submodules/predeploy-contracts/contracts/schedule/ISchedule.sol b/blockchain/predeploy-contracts/contracts/schedule/ISchedule.sol similarity index 100% rename from blockchain/submodules/predeploy-contracts/contracts/schedule/ISchedule.sol rename to blockchain/predeploy-contracts/contracts/schedule/ISchedule.sol diff --git a/blockchain/submodules/predeploy-contracts/contracts/schedule/Schedule.sol b/blockchain/predeploy-contracts/contracts/schedule/Schedule.sol similarity index 100% rename from blockchain/submodules/predeploy-contracts/contracts/schedule/Schedule.sol rename to blockchain/predeploy-contracts/contracts/schedule/Schedule.sol diff --git a/blockchain/submodules/predeploy-contracts/contracts/state_rent/IStateRent.sol b/blockchain/predeploy-contracts/contracts/state_rent/IStateRent.sol similarity index 100% rename from blockchain/submodules/predeploy-contracts/contracts/state_rent/IStateRent.sol rename to blockchain/predeploy-contracts/contracts/state_rent/IStateRent.sol diff --git a/blockchain/submodules/predeploy-contracts/contracts/state_rent/StateRent.sol b/blockchain/predeploy-contracts/contracts/state_rent/StateRent.sol similarity index 100% rename from blockchain/submodules/predeploy-contracts/contracts/state_rent/StateRent.sol rename to blockchain/predeploy-contracts/contracts/state_rent/StateRent.sol diff --git a/blockchain/submodules/predeploy-contracts/contracts/test/Erc20DemoContract.sol b/blockchain/predeploy-contracts/contracts/test/Erc20DemoContract.sol similarity index 100% rename from blockchain/submodules/predeploy-contracts/contracts/test/Erc20DemoContract.sol rename to blockchain/predeploy-contracts/contracts/test/Erc20DemoContract.sol diff --git a/blockchain/submodules/predeploy-contracts/contracts/token/MultiCurrency.sol b/blockchain/predeploy-contracts/contracts/token/MultiCurrency.sol similarity index 100% rename from blockchain/submodules/predeploy-contracts/contracts/token/MultiCurrency.sol rename to blockchain/predeploy-contracts/contracts/token/MultiCurrency.sol diff --git a/blockchain/submodules/predeploy-contracts/contracts/token/Token.sol b/blockchain/predeploy-contracts/contracts/token/Token.sol similarity index 100% rename from blockchain/submodules/predeploy-contracts/contracts/token/Token.sol rename to blockchain/predeploy-contracts/contracts/token/Token.sol diff --git a/blockchain/submodules/predeploy-contracts/contracts/utils/Address.d.ts b/blockchain/predeploy-contracts/contracts/utils/Address.d.ts similarity index 100% rename from blockchain/submodules/predeploy-contracts/contracts/utils/Address.d.ts rename to blockchain/predeploy-contracts/contracts/utils/Address.d.ts diff --git a/blockchain/submodules/predeploy-contracts/contracts/utils/Address.js b/blockchain/predeploy-contracts/contracts/utils/Address.js similarity index 100% rename from blockchain/submodules/predeploy-contracts/contracts/utils/Address.js rename to blockchain/predeploy-contracts/contracts/utils/Address.js diff --git a/blockchain/submodules/predeploy-contracts/contracts/utils/Address.sol b/blockchain/predeploy-contracts/contracts/utils/Address.sol similarity index 100% rename from blockchain/submodules/predeploy-contracts/contracts/utils/Address.sol rename to blockchain/predeploy-contracts/contracts/utils/Address.sol diff --git a/blockchain/submodules/predeploy-contracts/contracts/utils/Migrations.sol b/blockchain/predeploy-contracts/contracts/utils/Migrations.sol similarity index 100% rename from blockchain/submodules/predeploy-contracts/contracts/utils/Migrations.sol rename to blockchain/predeploy-contracts/contracts/utils/Migrations.sol diff --git a/blockchain/submodules/predeploy-contracts/contracts/utils/SystemContract.sol b/blockchain/predeploy-contracts/contracts/utils/SystemContract.sol similarity index 100% rename from blockchain/submodules/predeploy-contracts/contracts/utils/SystemContract.sol rename to blockchain/predeploy-contracts/contracts/utils/SystemContract.sol diff --git a/blockchain/submodules/predeploy-contracts/example/.editorconfig b/blockchain/predeploy-contracts/example/.editorconfig similarity index 100% rename from blockchain/submodules/predeploy-contracts/example/.editorconfig rename to blockchain/predeploy-contracts/example/.editorconfig diff --git a/blockchain/submodules/predeploy-contracts/example/.gitignore b/blockchain/predeploy-contracts/example/.gitignore similarity index 100% rename from blockchain/submodules/predeploy-contracts/example/.gitignore rename to blockchain/predeploy-contracts/example/.gitignore diff --git a/blockchain/submodules/predeploy-contracts/example/.rustfmt.toml b/blockchain/predeploy-contracts/example/.rustfmt.toml similarity index 100% rename from blockchain/submodules/predeploy-contracts/example/.rustfmt.toml rename to blockchain/predeploy-contracts/example/.rustfmt.toml diff --git a/blockchain/submodules/predeploy-contracts/example/CODE_OF_CONDUCT.md b/blockchain/predeploy-contracts/example/CODE_OF_CONDUCT.md similarity index 100% rename from blockchain/submodules/predeploy-contracts/example/CODE_OF_CONDUCT.md rename to blockchain/predeploy-contracts/example/CODE_OF_CONDUCT.md diff --git a/blockchain/submodules/predeploy-contracts/example/Cargo.dev.toml b/blockchain/predeploy-contracts/example/Cargo.dev.toml similarity index 100% rename from blockchain/submodules/predeploy-contracts/example/Cargo.dev.toml rename to blockchain/predeploy-contracts/example/Cargo.dev.toml diff --git a/blockchain/submodules/predeploy-contracts/example/HEADER-MIT b/blockchain/predeploy-contracts/example/HEADER-MIT similarity index 100% rename from blockchain/submodules/predeploy-contracts/example/HEADER-MIT rename to blockchain/predeploy-contracts/example/HEADER-MIT diff --git a/blockchain/submodules/predeploy-contracts/example/LICENSE.md b/blockchain/predeploy-contracts/example/LICENSE.md similarity index 100% rename from blockchain/submodules/predeploy-contracts/example/LICENSE.md rename to blockchain/predeploy-contracts/example/LICENSE.md diff --git a/blockchain/submodules/predeploy-contracts/example/Makefile b/blockchain/predeploy-contracts/example/Makefile similarity index 100% rename from blockchain/submodules/predeploy-contracts/example/Makefile rename to blockchain/predeploy-contracts/example/Makefile diff --git a/blockchain/submodules/predeploy-contracts/example/README.md b/blockchain/predeploy-contracts/example/README.md similarity index 100% rename from blockchain/submodules/predeploy-contracts/example/README.md rename to blockchain/predeploy-contracts/example/README.md diff --git a/blockchain/submodules/predeploy-contracts/example/rust-toolchain.toml b/blockchain/predeploy-contracts/example/rust-toolchain.toml similarity index 100% rename from blockchain/submodules/predeploy-contracts/example/rust-toolchain.toml rename to blockchain/predeploy-contracts/example/rust-toolchain.toml diff --git a/blockchain/submodules/predeploy-contracts/generate/generate.js b/blockchain/predeploy-contracts/generate/generate.js similarity index 100% rename from blockchain/submodules/predeploy-contracts/generate/generate.js rename to blockchain/predeploy-contracts/generate/generate.js diff --git a/blockchain/submodules/predeploy-contracts/migrations/1_initial_migration.js b/blockchain/predeploy-contracts/migrations/1_initial_migration.js similarity index 100% rename from blockchain/submodules/predeploy-contracts/migrations/1_initial_migration.js rename to blockchain/predeploy-contracts/migrations/1_initial_migration.js diff --git a/blockchain/submodules/predeploy-contracts/package.json b/blockchain/predeploy-contracts/package.json similarity index 100% rename from blockchain/submodules/predeploy-contracts/package.json rename to blockchain/predeploy-contracts/package.json diff --git a/blockchain/submodules/predeploy-contracts/resources/address.js.hbs b/blockchain/predeploy-contracts/resources/address.js.hbs similarity index 100% rename from blockchain/submodules/predeploy-contracts/resources/address.js.hbs rename to blockchain/predeploy-contracts/resources/address.js.hbs diff --git a/blockchain/submodules/predeploy-contracts/resources/address.sol.hbs b/blockchain/predeploy-contracts/resources/address.sol.hbs similarity index 100% rename from blockchain/submodules/predeploy-contracts/resources/address.sol.hbs rename to blockchain/predeploy-contracts/resources/address.sol.hbs diff --git a/blockchain/submodules/predeploy-contracts/resources/bytecodes.json b/blockchain/predeploy-contracts/resources/bytecodes.json similarity index 100% rename from blockchain/submodules/predeploy-contracts/resources/bytecodes.json rename to blockchain/predeploy-contracts/resources/bytecodes.json diff --git a/blockchain/submodules/predeploy-contracts/resources/tokens.json b/blockchain/predeploy-contracts/resources/tokens.json similarity index 100% rename from blockchain/submodules/predeploy-contracts/resources/tokens.json rename to blockchain/predeploy-contracts/resources/tokens.json diff --git a/blockchain/submodules/predeploy-contracts/scripts/prepare-contracts-package.sh b/blockchain/predeploy-contracts/scripts/prepare-contracts-package.sh similarity index 100% rename from blockchain/submodules/predeploy-contracts/scripts/prepare-contracts-package.sh rename to blockchain/predeploy-contracts/scripts/prepare-contracts-package.sh diff --git a/blockchain/submodules/predeploy-contracts/truffle-config.js b/blockchain/predeploy-contracts/truffle-config.js similarity index 100% rename from blockchain/submodules/predeploy-contracts/truffle-config.js rename to blockchain/predeploy-contracts/truffle-config.js diff --git a/blockchain/submodules/predeploy-contracts/yarn.lock b/blockchain/predeploy-contracts/yarn.lock similarity index 100% rename from blockchain/submodules/predeploy-contracts/yarn.lock rename to blockchain/predeploy-contracts/yarn.lock