Merge 0aa02db into 966de71

DistributedCollective · Jun 26, 2021 · 83a2ab5 · 83a2ab5
2 parents 966de71 + 0aa02db
commit 83a2ab5
Show file tree

Hide file tree

Showing 26 changed files with 2,438 additions and 1,859 deletions.
diff --git a/contracts/mockup/lockedSOVFailedMockup.sol b/contracts/mockup/lockedSOVFailedMockup.sol
diff --git a/contracts/mockup/lockedSOVMockup.sol b/contracts/mockup/lockedSOVMockup.sol
diff --git a/scripts/contractInteraction/FastBTC.json → ...pts/contractInteraction/ABIs/FastBTC.json b/scripts/contractInteraction/FastBTC.json → ...pts/contractInteraction/ABIs/FastBTC.json
diff --git a/...Interaction/LiquidityPoolV1Converter.json → ...action/ABIs/LiquidityPoolV1Converter.json b/...Interaction/LiquidityPoolV1Converter.json → ...action/ABIs/LiquidityPoolV1Converter.json
diff --git a/...Interaction/LiquidityPoolV2Converter.json → ...action/ABIs/LiquidityPoolV2Converter.json b/...Interaction/LiquidityPoolV2Converter.json → ...action/ABIs/LiquidityPoolV2Converter.json
diff --git a/scripts/contractInteraction/Owned.json → scripts/contractInteraction/ABIs/Owned.json b/scripts/contractInteraction/Owned.json → scripts/contractInteraction/ABIs/Owned.json
diff --git a/...contractInteraction/RBTCWrapperProxy.json → ...actInteraction/ABIs/RBTCWrapperProxy.json b/...contractInteraction/RBTCWrapperProxy.json → ...actInteraction/ABIs/RBTCWrapperProxy.json
diff --git a/scripts/contractInteraction/SovrynNft.json → ...s/contractInteraction/ABIs/SovrynNft.json b/scripts/contractInteraction/SovrynNft.json → ...s/contractInteraction/ABIs/SovrynNft.json
diff --git a/...ontractInteraction/SovrynSwapFormula.json → ...ctInteraction/ABIs/SovrynSwapFormula.json b/...ontractInteraction/SovrynSwapFormula.json → ...ctInteraction/ABIs/SovrynSwapFormula.json
diff --git a/...ontractInteraction/SovrynSwapNetwork.json → ...ctInteraction/ABIs/SovrynSwapNetwork.json b/...ontractInteraction/SovrynSwapNetwork.json → ...ctInteraction/ABIs/SovrynSwapNetwork.json