Merge pull request #439 from BoostryJP/bump/v22_12_contact

feat: Bump ibet-smart-contract to v22.12 latest
BoostryJP · Dec 14, 2022 · 1af09fb · 1af09fb
2 parents a7f3659 + 53472b6
commit 1af09fb
Show file tree

Hide file tree

Showing 22 changed files with 213 additions and 270 deletions.
diff --git a/app/utils/contract_error_code.py b/app/utils/contract_error_code.py
@@ -38,9 +38,9 @@ def error_code_msg(code_str: str) -> Tuple[int, str]:
         100101: "The address has not been registered.",
         100102: "Message sender must be the token owner.",
         # IbetShare (11XXXX)
-        110001:	"Lock address is invalid.",
+        110001:	"Lock address is invalid.",  # < v22.12
         110002: "Lock amount is greater than message sender balance.",
-        110101: "Unlock address is invalid.",
+        110101: "Unlock address is invalid.",  # < v22.12
         110102: "Unlock amount is greater than locked amount.",
         110201: "The token isn't transferable.",
         110202: "Destination address check is failed.",
@@ -62,10 +62,11 @@ def error_code_msg(code_str: str) -> Tuple[int, str]:
         111002: "Personal information of message sender isn't registered to token owner.",
         111101: "Redeem amount is less than locked address balance.",
         111102: "Redeem amount is less than target address balance.",
+        111201: "Unlock amount is greater than locked amount.",
         # IbetStraightBond (12XXXX)
-        120001: "Lock address is invalid.",
+        120001: "Lock address is invalid.",  # < v22.12
         120002: "Lock amount is greater than message sender balance.",
-        120101: "Unlock address is invalid.",
+        120101: "Unlock address is invalid.",  # < v22.12
         120102: "Unlock amount is greater than locked amount.",
         120201: "The token isn't transferable.",
         120202: "Destination address check is failed.",
@@ -86,6 +87,7 @@ def error_code_msg(code_str: str) -> Tuple[int, str]:
         121002: "Personal information of message sender isn't registered to token owner.",
         121101: "Redeem amount is less than locked address balance.",
         121102: "Redeem amount is less than target address balance.",
+        121201: "Unlock amount is greater than locked amount.",
         # IbetCoupon (13XXXX)
         130001: "Destination address isn't tradable exchange.",
         130101: "Message sender balance is insufficient.",

diff --git a/contracts/ContractRegistry.json b/contracts/ContractRegistry.json
diff --git a/contracts/E2EMessaging.json b/contracts/E2EMessaging.json
diff --git a/contracts/EscrowStorage.json b/contracts/EscrowStorage.json
diff --git a/contracts/ExchangeStorage.json b/contracts/ExchangeStorage.json
diff --git a/contracts/IbetCoupon.json b/contracts/IbetCoupon.json
diff --git a/contracts/IbetEscrow.json b/contracts/IbetEscrow.json
diff --git a/contracts/IbetExchange.json b/contracts/IbetExchange.json
diff --git a/contracts/IbetMembership.json b/contracts/IbetMembership.json
diff --git a/contracts/IbetSecurityTokenEscrow.json b/contracts/IbetSecurityTokenEscrow.json
diff --git a/contracts/IbetSecurityTokenInterface.json b/contracts/IbetSecurityTokenInterface.json
@@ -112,25 +112,6 @@
       "name": "ApproveTransfer",
       "type": "event"
     },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "lockAddress",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "bool",
-          "name": "auth",
-          "type": "bool"
-        }
-      ],
-      "name": "AuthorizeLockAddress",
-      "type": "event"
-    },
     {
       "anonymous": false,
       "inputs": [
@@ -252,6 +233,12 @@
           "internalType": "uint256",
           "name": "value",
           "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "string",
+          "name": "data",
+          "type": "string"
         }
       ],
       "name": "Lock",
@@ -339,6 +326,12 @@
           "internalType": "uint256",
           "name": "value",
           "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "string",
+          "name": "data",
+          "type": "string"
         }
       ],
       "name": "Unlock",
@@ -484,43 +477,6 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "_lockAddress",
-          "type": "address"
-        },
-        {
-          "internalType": "bool",
-          "name": "_auth",
-          "type": "bool"
-        }
-      ],
-      "name": "authorizeLockAddress",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "name": "authorizedLockAddress",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [
         {
@@ -627,6 +583,39 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "_lockAddress",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "_accountAddress",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "_recipientAddress",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "_value",
+          "type": "uint256"
+        },
+        {
+          "internalType": "string",
+          "name": "_data",
+          "type": "string"
+        }
+      ],
+      "name": "forceUnlock",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "isOffering",
@@ -674,6 +663,11 @@
           "internalType": "uint256",
           "name": "_value",
           "type": "uint256"
+        },
+        {
+          "internalType": "string",
+          "name": "_data",
+          "type": "string"
         }
       ],
       "name": "lock",
@@ -1048,6 +1042,11 @@
           "internalType": "uint256",
           "name": "_value",
           "type": "uint256"
+        },
+        {
+          "internalType": "string",
+          "name": "_data",
+          "type": "string"
         }
       ],
       "name": "unlock",

diff --git a/contracts/IbetShare.json b/contracts/IbetShare.json
diff --git a/contracts/IbetStandardToken.json b/contracts/IbetStandardToken.json
diff --git a/contracts/IbetStraightBond.json b/contracts/IbetStraightBond.json
diff --git a/contracts/Ownable.json b/contracts/Ownable.json
@@ -51,6 +51,6 @@
       "type": "function"
     }
   ],
-  "bytecode": "608060405234801561001057600080fd5b5060008054600160a060020a031916331790556102b1806100326000396000f3fe608060405234801561001057600080fd5b5060043610610052577c010000000000000000000000000000000000000000000000000000000060003504638da5cb5b8114610057578063f2fde38b14610086575b600080fd5b60005461006a90600160a060020a031681565b604051600160a060020a03909116815260200160405180910390f35b6100996100943660046101fd565b61009b565b005b60005460408051808201909152600681527f3530303030310000000000000000000000000000000000000000000000000000602082015290600160a060020a0316331461011e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610115919061022d565b60405180910390fd5b5060408051808201909152600681527f35303031303100000000000000000000000000000000000000000000000000006020820152600160a060020a038216610194576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610115919061022d565b5060008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b60006020828403121561020f57600080fd5b8135600160a060020a038116811461022657600080fd5b9392505050565b600060208083528351808285015260005b8181101561025a5785810183015185820160400152820161023e565b506000604082860101526040601f19601f830116850101925050509291505056fea2646970667358221220efa5d4a146d378c86a1c416dbf7ea37bb1d1232b416b2d01dcffa85fbc922c0e64736f6c63430008110033",
-  "deployedBytecode": "608060405234801561001057600080fd5b5060043610610052577c010000000000000000000000000000000000000000000000000000000060003504638da5cb5b8114610057578063f2fde38b14610086575b600080fd5b60005461006a90600160a060020a031681565b604051600160a060020a03909116815260200160405180910390f35b6100996100943660046101fd565b61009b565b005b60005460408051808201909152600681527f3530303030310000000000000000000000000000000000000000000000000000602082015290600160a060020a0316331461011e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610115919061022d565b60405180910390fd5b5060408051808201909152600681527f35303031303100000000000000000000000000000000000000000000000000006020820152600160a060020a038216610194576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610115919061022d565b5060008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b60006020828403121561020f57600080fd5b8135600160a060020a038116811461022657600080fd5b9392505050565b600060208083528351808285015260005b8181101561025a5785810183015185820160400152820161023e565b506000604082860101526040601f19601f830116850101925050509291505056fea2646970667358221220efa5d4a146d378c86a1c416dbf7ea37bb1d1232b416b2d01dcffa85fbc922c0e64736f6c63430008110033"
+  "bytecode": "608060405234801561001057600080fd5b5060008054600160a060020a031916331790556102b1806100326000396000f3fe608060405234801561001057600080fd5b5060043610610052577c010000000000000000000000000000000000000000000000000000000060003504638da5cb5b8114610057578063f2fde38b14610086575b600080fd5b60005461006a90600160a060020a031681565b604051600160a060020a03909116815260200160405180910390f35b6100996100943660046101fd565b61009b565b005b60005460408051808201909152600681527f3530303030310000000000000000000000000000000000000000000000000000602082015290600160a060020a0316331461011e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610115919061022d565b60405180910390fd5b5060408051808201909152600681527f35303031303100000000000000000000000000000000000000000000000000006020820152600160a060020a038216610194576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610115919061022d565b5060008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b60006020828403121561020f57600080fd5b8135600160a060020a038116811461022657600080fd5b9392505050565b600060208083528351808285015260005b8181101561025a5785810183015185820160400152820161023e565b506000604082860101526040601f19601f830116850101925050509291505056fea26469706673582212206547f1dca2dcf0ef3f08a5c3987c8fdfb03c78ebc11763630dfff057cb5a895564736f6c63430008110033",
+  "deployedBytecode": "608060405234801561001057600080fd5b5060043610610052577c010000000000000000000000000000000000000000000000000000000060003504638da5cb5b8114610057578063f2fde38b14610086575b600080fd5b60005461006a90600160a060020a031681565b604051600160a060020a03909116815260200160405180910390f35b6100996100943660046101fd565b61009b565b005b60005460408051808201909152600681527f3530303030310000000000000000000000000000000000000000000000000000602082015290600160a060020a0316331461011e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610115919061022d565b60405180910390fd5b5060408051808201909152600681527f35303031303100000000000000000000000000000000000000000000000000006020820152600160a060020a038216610194576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610115919061022d565b5060008054604051600160a060020a03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a36000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b60006020828403121561020f57600080fd5b8135600160a060020a038116811461022657600080fd5b9392505050565b600060208083528351808285015260005b8181101561025a5785810183015185820160400152820161023e565b506000604082860101526040601f19601f830116850101925050509291505056fea26469706673582212206547f1dca2dcf0ef3f08a5c3987c8fdfb03c78ebc11763630dfff057cb5a895564736f6c63430008110033"
 }