revised solidity folder structure

finmath · Mar 5, 2024 · dc97cd1 · dc97cd1
1 parent 44d8f2d
commit dc97cd1
Show file tree

Hide file tree

Showing 40 changed files with 3 additions and 79 deletions.
diff --git a/solidity/assets/development/.gitignore → solidity/.gitignore b/solidity/assets/development/.gitignore → solidity/.gitignore
diff --git a/solidity/assets/development/doc/sdc_livecycle_sequence_diagram.txt b/solidity/assets/development/doc/sdc_livecycle_sequence_diagram.txt
diff --git a/.../erc-dvp-implementation/AssetContract.sol → ...dity/contracts/dvp-impl/AssetContract.sol b/.../erc-dvp-implementation/AssetContract.sol → ...dity/contracts/dvp-impl/AssetContract.sol
diff --git a/...rc-dvp-implementation/PaymentContract.sol → ...ty/contracts/dvp-impl/PaymentContract.sol b/...rc-dvp-implementation/PaymentContract.sol → ...ty/contracts/dvp-impl/PaymentContract.sol
diff --git a/...ntation/interface/IDecryptionContract.sol → ...vp-impl/interface/IDecryptionContract.sol b/...ntation/interface/IDecryptionContract.sol → ...vp-impl/interface/IDecryptionContract.sol
diff --git a/...ementation/interface/ILockingContract.sol → ...s/dvp-impl/interface/ILockingContract.sol b/...ementation/interface/ILockingContract.sol → ...s/dvp-impl/interface/ILockingContract.sol
diff --git a/...lopment/contracts/sdc/ERC20Settlement.sol → solidity/contracts/sdc/ERC20Settlement.sol b/...lopment/contracts/sdc/ERC20Settlement.sol → solidity/contracts/sdc/ERC20Settlement.sol
diff --git a/.../contracts/sdc/ERC20SettlementTrigger.sol → .../contracts/sdc/ERC20SettlementTrigger.sol b/.../contracts/sdc/ERC20SettlementTrigger.sol → .../contracts/sdc/ERC20SettlementTrigger.sol
diff --git a/...opment/contracts/sdc/IERC20Settlement.sol → solidity/contracts/sdc/IERC20Settlement.sol b/...opment/contracts/sdc/IERC20Settlement.sol → solidity/contracts/sdc/IERC20Settlement.sol
diff --git a/...assets/development/contracts/sdc/ISDC.sol → solidity/contracts/sdc/ISDC.sol b/...assets/development/contracts/sdc/ISDC.sol → solidity/contracts/sdc/ISDC.sol
diff --git a/.../assets/development/contracts/sdc/SDC.sol → solidity/contracts/sdc/SDC.sol b/.../assets/development/contracts/sdc/SDC.sol → solidity/contracts/sdc/SDC.sol
diff --git a/...elopment/contracts/sdc/SDCDefaultable.sol → solidity/contracts/sdc/SDCDefaultable.sol b/...elopment/contracts/sdc/SDCDefaultable.sol → solidity/contracts/sdc/SDCDefaultable.sol
diff --git a/...velopment/contracts/sdc/SDCOwnBalance.sol → solidity/contracts/sdc/SDCOwnBalance.sol b/...velopment/contracts/sdc/SDCOwnBalance.sol → solidity/contracts/sdc/SDCOwnBalance.sol
diff --git a/...pment/contracts/sdc/SmartBondContract.sol → solidity/contracts/sdc/SmartBondContract.sol b/...pment/contracts/sdc/SmartBondContract.sol → solidity/contracts/sdc/SmartBondContract.sol
diff --git a/solidity/assets/development/README.md → solidity/doc/README.md b/solidity/assets/development/README.md → solidity/doc/README.md
diff --git a/solidity/assets/development/SDC.md → solidity/doc/SDC.md b/solidity/assets/development/SDC.md → solidity/doc/SDC.md
diff --git a/solidity/assets/erc-6123/README.md → solidity/ercs/erc-6123/README.md b/solidity/assets/erc-6123/README.md → solidity/ercs/erc-6123/README.md
diff --git a/...ts/erc-6123/contracts/ERC20Settlement.sol → ...cs/erc-6123/contracts/ERC20Settlement.sol b/...ts/erc-6123/contracts/ERC20Settlement.sol → ...cs/erc-6123/contracts/ERC20Settlement.sol
diff --git a/...s/erc-6123/contracts/IERC20Settlement.sol → ...s/erc-6123/contracts/IERC20Settlement.sol b/...s/erc-6123/contracts/IERC20Settlement.sol → ...s/erc-6123/contracts/IERC20Settlement.sol
diff --git a/solidity/assets/erc-6123/contracts/ISDC.sol → solidity/ercs/erc-6123/contracts/ISDC.sol b/solidity/assets/erc-6123/contracts/ISDC.sol → solidity/ercs/erc-6123/contracts/ISDC.sol
diff --git a/solidity/assets/erc-6123/contracts/SDC.sol → solidity/ercs/erc-6123/contracts/SDC.sol b/solidity/assets/erc-6123/contracts/SDC.sol → solidity/ercs/erc-6123/contracts/SDC.sol
diff --git a/.../erc-6123/contracts/SDCPledgedBalance.sol → .../erc-6123/contracts/SDCPledgedBalance.sol b/.../erc-6123/contracts/SDCPledgedBalance.sol → .../erc-6123/contracts/SDCPledgedBalance.sol
diff --git a/...ty/assets/erc-6123/contracts/SDCToken.sol → ...dity/ercs/erc-6123/contracts/SDCToken.sol b/...ty/assets/erc-6123/contracts/SDCToken.sol → ...dity/ercs/erc-6123/contracts/SDCToken.sol
diff --git a/...23/doc/sample-tradedata-filestructure.xml → ...23/doc/sample-tradedata-filestructure.xml b/...23/doc/sample-tradedata-filestructure.xml → ...23/doc/sample-tradedata-filestructure.xml
diff --git a/...23/doc/sdc_lifecycle_sequence_diagram.png → ...23/doc/sdc_lifecycle_sequence_diagram.png b/...23/doc/sdc_lifecycle_sequence_diagram.png → ...23/doc/sdc_lifecycle_sequence_diagram.png
diff --git a/...6123/doc/sdc_trade_and_process_states.png → ...6123/doc/sdc_trade_and_process_states.png b/...6123/doc/sdc_trade_and_process_states.png → ...6123/doc/sdc_trade_and_process_states.png
diff --git a/.../assets/erc-6123/doc/sdc_trade_states.png → ...ty/ercs/erc-6123/doc/sdc_trade_states.png b/.../assets/erc-6123/doc/sdc_trade_states.png → ...ty/ercs/erc-6123/doc/sdc_trade_states.png
diff --git a/solidity/ercs/erc-6123.md → solidity/ercs/erc-6123/erc-6123.md b/solidity/ercs/erc-6123.md → solidity/ercs/erc-6123/erc-6123.md
diff --git a/solidity/assets/erc-6123/hardhat.config.js → solidity/ercs/erc-6123/hardhat.config.js b/solidity/assets/erc-6123/hardhat.config.js → solidity/ercs/erc-6123/hardhat.config.js
diff --git a/solidity/assets/erc-6123/package.json → solidity/ercs/erc-6123/package.json b/solidity/assets/erc-6123/package.json → solidity/ercs/erc-6123/package.json
diff --git a/solidity/assets/erc-6123/test/SDCTests.js → solidity/ercs/erc-6123/test/SDCTests.js b/solidity/assets/erc-6123/test/SDCTests.js → solidity/ercs/erc-6123/test/SDCTests.js
diff --git a/...ssets/erc-dvp/contracts/erc-dvp-asset.sol → ...ercs/erc-7573/contracts/erc-dvp-asset.sol b/...ssets/erc-dvp/contracts/erc-dvp-asset.sol → ...ercs/erc-7573/contracts/erc-dvp-asset.sol
diff --git a/...ets/erc-dvp/contracts/erc-dvp-payment.sol → ...cs/erc-7573/contracts/erc-dvp-payment.sol b/...ets/erc-dvp/contracts/erc-dvp-payment.sol → ...cs/erc-7573/contracts/erc-dvp-payment.sol
diff --git a/solidity/assets/erc-dvp/doc/DvP-Seq-Diag.png → solidity/ercs/erc-7573/doc/DvP-Seq-Diag.png b/solidity/assets/erc-dvp/doc/DvP-Seq-Diag.png → solidity/ercs/erc-7573/doc/DvP-Seq-Diag.png
diff --git a/solidity/ercs/erc-dvp.md → solidity/ercs/erc-7573/erc-dvp.md b/solidity/ercs/erc-dvp.md → solidity/ercs/erc-7573/erc-dvp.md
@@ -60,7 +60,7 @@ The rationale is described in the following sequence diagram.
 
 ### Sequence diagram of delivery versus payment
 
-![image info](../assets/erc-dvp/doc/DvP-Seq-Diag.png)
+![image info](doc/DvP-Seq-Diag.png)
 
 ## Reference Implementation
 

diff --git a/...dity/assets/development/hardhat.config.js → solidity/hardhat.config.js b/...dity/assets/development/hardhat.config.js → solidity/hardhat.config.js
diff --git a/...dity/assets/development/package-lock.json → solidity/package-lock.json b/...dity/assets/development/package-lock.json → solidity/package-lock.json
diff --git a/solidity/assets/development/package.json → solidity/package.json b/solidity/assets/development/package.json → solidity/package.json
@@ -8,8 +8,8 @@
     "test": "test"
   },
   "scripts": {
-    "build": "hardhat compile",
-    "test": "hardhat test"
+    "build": "assets/development/node_modules/.bin/hardhat compile",
+    "test": "assets/development/node_modules/.bin/hardhat ../../test"
   },
   "keywords": [],
   "author": "",

diff --git a/solidity/assets/development/test/DvP.js → solidity/test/DvP.js b/solidity/assets/development/test/DvP.js → solidity/test/DvP.js
diff --git a/solidity/assets/development/test/SDCBond.js → solidity/test/SDCBond.js b/solidity/assets/development/test/SDCBond.js → solidity/test/SDCBond.js