Merge pull request #274 from BoostryJP/Release

v1.0.0
BoostryJP · Jan 4, 2021 · 3a68df7 · 3a68df7
2 parents 1c3139d + b584db4
commit 3a68df7
Show file tree

Hide file tree

Showing 48 changed files with 264 additions and 130 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,9 +3,12 @@ __pycache__
 .history
 .hypothesis
 build/
+output/
 reports/
 .vscode/
 .idea/
 
 #pyenv
 .python-version
+
+!.gitkeep
diff --git a/Dockerfile b/Dockerfile
@@ -42,15 +42,23 @@ RUN apt-get update && \
             libyaml-cpp-dev \
             libgcc1 \
             libstdc++6 \
-            libz3-dev
+            libz3-dev \
+            jq \
+            expect
 
 # Solidity
 USER root
 RUN wget -q https://github.com/ethereum/solidity/releases/download/v0.4.25/solidity-ubuntu-trusty.zip && \
     unzip solidity-ubuntu-trusty.zip && \
     cp solc /usr/bin && \
     chmod 755 /usr/bin/solc && \
-    rm solc lllc
+    rm solc lllc solidity-ubuntu-trusty.zip
+
+# AWS CLI
+RUN wget -q https://awscli.amazonaws.com/awscli-exe-linux-$(arch).zip -O awscliv2.zip && \
+    unzip awscliv2.zip && \
+    ./aws/install && \
+    rm -r aws awscliv2.zip
 
 # pyenv
 RUN git clone https://github.com/pyenv/pyenv.git

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 # ibet Smart Contract
 
 <p>
-  <img alt="Version" src="https://img.shields.io/badge/version-0.15-blue.svg?cacheSeconds=2592000" />
+  <img alt="Version" src="https://img.shields.io/badge/version-1.0-blue.svg?cacheSeconds=2592000" />
   <a href="#" target="_blank">
     <img alt="License: Apache--2.0" src="https://img.shields.io/badge/License-Apache--2.0-yellow.svg" />
   </a>
@@ -18,6 +18,18 @@ $ pip install -r requirements.txt
 ```
 
 ## Deploy
+The EOA used to deploy the contract can be switched by setting environment variables.
+1. from GETH
+* ETH_ACCOUNT_PASSWORD - The first EOA passphrase.
+2. from Ethereum Keystore FILE
+* ETH_KEYSTORE_PATH - aaa
+* ETH_ACCOUNT_PASSWORD - EOA passphrase.
+3. from Ethereum Private Key
+* ETH_PRIVATE_KEY - 64 random hex characters.
+* ETH_ACCOUNT_PASSWORD - Passphrase to set for generated EOA.
+4. from AWS Secrets Manager
+* AWS_SECRETS_ID - Secrets's ARN.
+* ETH_ACCOUNT_PASSWORD - EOA passphrase.
 ```bash
 $ ./scripts/deploy.sh
 ```

diff --git a/contracts/ExchangeRegulatorService.sol b/contracts/ExchangeRegulatorService.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and

diff --git a/contracts/ExchangeStorage.sol b/contracts/ExchangeStorage.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and

diff --git a/contracts/IbetCoupon.sol b/contracts/IbetCoupon.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and

diff --git a/contracts/IbetCouponExchange.sol b/contracts/IbetCouponExchange.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and
@@ -739,12 +739,9 @@ contract IbetCouponExchange is Ownable {
                 order.owner, agreement.counterpart, order.price,
                 agreement.amount, order.agent);
         } else {
-            // 更新処理：売り注文の場合、突合相手（買い手）の注文数量だけ注文者（売り手）の預かりを解放
-            //  -> 預かりの引き出し。
-            // 取り消した注文は無効化する（注文中状態に戻さない）
-            setCommitment(order.owner, order.token,
-                commitmentOf(order.owner, order.token).sub(agreement.amount));
-            IbetCoupon(order.token).transfer(order.owner,agreement.amount);
+            // 更新処理：元注文の数量を戻す
+            setOrder(_orderId, order.owner, order.token, order.amount.add(agreement.amount),
+                order.price, order.isBuy, order.agent, order.canceled);
             // イベント登録：決済NG
             emit SettlementNG(order.token, _orderId, _agreementId,
                 agreement.counterpart, order.owner, order.price,

diff --git a/contracts/IbetMembership.sol b/contracts/IbetMembership.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and

diff --git a/contracts/IbetMembershipExchange.sol b/contracts/IbetMembershipExchange.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and
@@ -740,12 +740,9 @@ contract IbetMembershipExchange is Ownable {
                 order.owner, agreement.counterpart, order.price,
                 agreement.amount, order.agent);
         } else {
-            // 更新処理：売り注文の場合、突合相手（買い手）の注文数量だけ注文者（売り手）の預かりを解放
-            //  -> 預かりの引き出し。
-            // 取り消した注文は無効化する（注文中状態に戻さない）
-            setCommitment(order.owner, order.token,
-                commitmentOf(order.owner, order.token).sub(agreement.amount));
-            IbetMembership(order.token).transfer(order.owner,agreement.amount);
+            // 更新処理：元注文の数量を戻す
+            setOrder(_orderId, order.owner, order.token, order.amount.add(agreement.amount),
+                order.price, order.isBuy, order.agent, order.canceled);
             // イベント登録：決済NG
             emit SettlementNG(order.token, _orderId, _agreementId,
                 agreement.counterpart, order.owner, order.price,

diff --git a/contracts/IbetOTCExchange.sol b/contracts/IbetOTCExchange.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and
@@ -738,18 +738,9 @@ contract IbetOTCExchange is Ownable, OTCExchangeStorageModel {
         // 更新処理: キャンセル済みフラグをキャンセル（True）に更新する
          OTCExchangeStorage(storageAddress).setAgreementCanceled( _orderId, _agreementId, true);
 
-        // 更新処理: 突合相手（買い手）の注文数量だけ注文者（売り手）の預かりを解放
-        //  -> 預かりの引き出し。
-        // 取り消した注文は無効化する（注文中状態に戻さない）
-        setCommitment(
-            order.owner,
-            order.token,
-            commitmentOf(order.owner, order.token).sub(agreement.amount)
-        );
-        IbetStandardTokenInterface(order.token).transfer(
-            order.owner,
-            agreement.amount
-        );
+        // 更新処理：元注文の数量を戻す
+        OTCExchangeStorage(storageAddress).setOrderAmount(_orderId, order.amount.add(agreement.amount));
+
         // イベント登録: 決済NG
         emit SettlementNG(
             order.token,

diff --git a/contracts/IbetShare.sol b/contracts/IbetShare.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and

diff --git a/contracts/IbetStraightBond.sol b/contracts/IbetStraightBond.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and

diff --git a/contracts/IbetStraightBondExchange.sol b/contracts/IbetStraightBondExchange.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and
@@ -790,12 +790,9 @@ contract IbetStraightBondExchange is Ownable {
                 order.owner, agreement.counterpart, order.price,
                 agreement.amount, order.agent);
         } else {
-            // 更新処理：売り注文の場合、突合相手（買い手）の注文数量だけ注文者（売り手）の預かりを解放
-            //  -> 預かりの引き出し。
-            // 取り消した注文は無効化する（注文中状態に戻さない）
-            setCommitment(order.owner, order.token,
-                commitmentOf(order.owner, order.token).sub(agreement.amount));
-            IbetStraightBond(order.token).transfer(order.owner, agreement.amount);
+            // 更新処理：元注文の数量を戻す
+            setOrder(_orderId, order.owner, order.token, order.amount.add(agreement.amount),
+                order.price, order.isBuy, order.agent, order.canceled);
             // イベント登録：決済NG
             emit SettlementNG(order.token, _orderId, _agreementId,
                 agreement.counterpart, order.owner, order.price,

diff --git a/contracts/OTCExchangeStorage.sol b/contracts/OTCExchangeStorage.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and

diff --git a/contracts/OTCExchangeStorageModel.sol b/contracts/OTCExchangeStorageModel.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and

diff --git a/contracts/Ownable.sol b/contracts/Ownable.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and

diff --git a/contracts/PaymentGateway.sol b/contracts/PaymentGateway.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and

diff --git a/contracts/PersonalInfo.sol b/contracts/PersonalInfo.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and

diff --git a/contracts/RegulatorService.sol b/contracts/RegulatorService.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and

diff --git a/contracts/SafeMath.sol b/contracts/SafeMath.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and

diff --git a/contracts/TokenList.sol b/contracts/TokenList.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and

diff --git a/interfaces/ContractReceiver.sol b/interfaces/ContractReceiver.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and

diff --git a/interfaces/IbetStandardTokenInterface.sol b/interfaces/IbetStandardTokenInterface.sol
@@ -8,7 +8,7 @@
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed onan "AS IS" BASIS,
+* software distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 * See the License for the specific language governing permissions and

diff --git a/output/.gitkeep b/output/.gitkeep
diff --git a/qa.sh b/qa.sh
@@ -9,7 +9,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed onan "AS IS" BASIS,
+# software distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 # See the License for the specific language governing permissions and

diff --git a/requirements.txt b/requirements.txt
@@ -16,18 +16,13 @@ click==6.7
 contextlib2==0.5.5
 coverage==4.5.4
 cytoolz==0.10.1
-eth-abi==2.1.1
 eth-account==0.5.2
 eth-brownie==1.11.11
 eth-event==1.2.0
-eth-hash==0.2.0
 eth-keyfile==0.5.1
-eth-keys==0.3.3
 eth-rlp==0.1.2
-eth-tester==0.1.0b11
 eth-testrpc==1.3.3
 eth-typing==2.2.1
-eth-utils==1.9.5
 ethereum==1.6.1
 execnet==1.7.1
 hexbytes==0.2.1
@@ -54,7 +49,7 @@ pluggy==0.13.1
 prompt-toolkit==3.0.7
 protobuf==3.11.3
 psutil==5.7.3
-py==1.8.1
+py==1.8.2
 py-geth==2.0.1
 py-solc==2.1.0
 py-solc-ast==1.2.5

diff --git a/scripts/PaymentGateway_addAgent.py b/scripts/PaymentGateway_addAgent.py
@@ -8,7 +8,7 @@
 http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed onan "AS IS" BASIS,
+software distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
 See the License for the specific language governing permissions and

diff --git a/scripts/addAgent.sh b/scripts/addAgent.sh
@@ -9,7 +9,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed onan "AS IS" BASIS,
+# software distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 # See the License for the specific language governing permissions and