Finish 2

Co-authored-by: William Occelli <william.occelli@gmail.com>
corentingiraud · Jan 31, 2020 · 7fa1e3d · 7fa1e3d
1 parent c013065
commit 7fa1e3d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/TODO.md b/TODO.md
@@ -23,11 +23,4 @@ Account #0: {e087b47782c968bc3e31a3b1d9196af833501260} keystore:///root/.ethereu
 Account #1: {79dcbbbe41c3b5a1e5ce9029b30478f1be308d96} keystore:///root/.ethereum/chaine1T/keystore/UTC--2020-01-27T16-46-29.621517206Z--79dcbbbe41c3b5a1e5ce9029b30478f1be308d96
 Account #2: {f6d8531f60704ff3fe038c30642044d835edc847} keystore:///root/.ethereum/chaine1T/keystore/UTC--2020-01-31T07-41-44.548507317Z--f6d8531f60704ff3fe038c30642044d835edc847
 
-Contract address: 0xf2c04eabb64d7f183e9a1100ff7550f76c0569a7
-
-
-0x6493eecd972c1ba7ec0a4fdb783ae090fd55137d
-0x45dd3d4b42e3b46d232357bf43fb12f4a4ba7c89
-
-Avec deux heirs:
-0x6c6b67dee8777d423ec9718ef599037719b824df
+Contract address: 0xc54a16e2b36fb01ff71c89020c8bc269cb7b9e8d
diff --git a/java-projects/smarties/src/main/java/fr/insa/smarties/Menu.java b/java-projects/smarties/src/main/java/fr/insa/smarties/Menu.java
@@ -134,6 +134,7 @@ private int writeWill(){
             System.out.println(ANSI_GREEN + "Calling smart contract function in the blockchain..." + ANSI_RESET);
             Will will = new Will(amount, heirs, this._currentAccount);
             System.out.println("Will address: " + will.getAddress());
+            this._currentWill = will;
         } catch (Exception e) {
             e.printStackTrace();
             System.out.println("Exception raised during account initialization. Please try again");

diff --git a/java-projects/smarties/src/main/java/fr/insa/smarties/Smartie.java b/java-projects/smarties/src/main/java/fr/insa/smarties/Smartie.java
@@ -38,7 +38,7 @@
  * <p>Generated with web3j version 3.5.0.
  */
 public class Smartie extends Contract {
-    private static final String BINARY = "6080604052604051610fad380380610fad8339810160405280516020820151908201910160008080808061003161039f565b600134116100a057604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4e6f7420656e6f7567682077656920616464656420746f20636f6e7472616374604482015290519081900360640190fd5b87519550865194506000861180156100b85750600085115b80156100c357508486145b15156100cb57fe5b60009350600092505b848310156102cd57600091505b6001548210156101d35787838151811015156100f957fe5b90602001906020020151600160a060020a031660018381548110151561011b57fe5b6000918252602090912060029091020154600160a060020a031614156101c857604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603560248201527f4572726f722c2074686520686569722068617320616c7265616479206265656e60448201527f206465636c6172656420696e207468652077696c6c0000000000000000000000606482015290519081900360840190fd5b6001909101906100e1565b604080519081016040528089858151811015156101ec57fe5b90602001906020020151600160a060020a03168152602001888581518110151561021257fe5b60209081029190910181015190915260018054808201825560009190915282517fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf660029092029182018054600160a060020a031916600160a060020a03909216919091179055908201517fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf79091015587519091508790849081106102b257fe5b906020019060200201518401935082806001019350506100d4565b6064841461036257604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602160248201527f546f74616c2070657263656e74616765206e6f7420657175616c20746f20313060448201527f3000000000000000000000000000000000000000000000000000000000000000606482015290519081900360840190fd5b505060008054600160a060020a031916331781556005805460ff19908116909155600780549091169055600455505034600255506103b692505050565b604080518082019091526000808252602082015290565b610be8806103c56000396000f3006080604052600436106100da5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166314fae21881146100df5780631c0795c314610106578063252d3b7b146101415780633641a7b71461014957806338cc48311461016057806357c9ca14146101915780635a58cd4c146101ba5780635eeddcaa146101cf5780636f92e149146101e4578063893d20e81461026e5780638bf3a17c1461028357806399baa10c1461029b578063a9c74a66146102b0578063aedb1c8f146102c5578063c039c432146102da575b600080fd5b3480156100eb57600080fd5b506100f46102ef565b60408051918252519081900360200190f35b34801561011257600080fd5b5061011e6004356102f5565b60408051600160a060020a03909316835260208301919091528051918290030190f35b6100f461032b565b34801561015557600080fd5b5061015e61049e565b005b34801561016c57600080fd5b50610175610663565b60408051600160a060020a039092168252519081900360200190f35b34801561019d57600080fd5b506101a6610667565b604080519115158252519081900360200190f35b3480156101c657600080fd5b5061015e610670565b3480156101db57600080fd5b506100f4610693565b3480156101f057600080fd5b506101f9610699565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561023357818101518382015260200161021b565b50505050905090810190601f1680156102605780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561027a57600080fd5b50610175610959565b34801561028f57600080fd5b506100f4600435610968565b3480156102a757600080fd5b506101a6610a96565b3480156102bc57600080fd5b506100f4610a9f565b3480156102d157600080fd5b5061015e610aa4565b3480156102e657600080fd5b506100f4610bb6565b60065481565b600180548290811061030357fe5b600091825260209091206002909102018054600190910154600160a060020a03909116915082565b60075460009060ff16156103af576040805160e560020a62461bcd02815260206004820152602560248201527f43616e2f2774206164642057656920746f206465737472756374656420636f6e60448201527f7472616374000000000000000000000000000000000000000000000000000000606482015290519081900360840190fd5b600054600160a060020a03163314610437576040805160e560020a62461bcd02815260206004820152602c60248201527f4f6e6c7920746865206f776e6572206f662074686520636f6e7472616374206360448201527f616e206164642065746865720000000000000000000000000000000000000000606482015290519081900360840190fd5b6001341015610490576040805160e560020a62461bcd02815260206004820152601760248201527f4e6f7420656e6f756768207765692070726f7669646564000000000000000000604482015290519081900360640190fd5b506002805434019055303190565b60055460ff161515610520576040805160e560020a62461bcd02815260206004820152602a60248201527f546865206f776e6572206973206e6f74206f6666696369616c6c79206465636c60448201527f6172656420646561642e00000000000000000000000000000000000000000000606482015290519081900360840190fd5b42600654607801111515156105cb576040805160e560020a62461bcd02815260206004820152604160248201527f546865206c6174656e6379206e656564656420666f72207468652077696c6c2060448201527f746f20626520636c61696d6564206973206e6f7420796574207265616368656460648201527f2e00000000000000000000000000000000000000000000000000000000000000608482015290519081900360a40190fd5b60075460ff161561064c576040805160e560020a62461bcd02815260206004820152602860248201527f43616e2f277420636c61696d2077696c6c20696e20646573747275637465642060448201527f636f6e7472616374000000000000000000000000000000000000000000000000606482015290519081900360840190fd5b610654610aa4565b6007805460ff19166001179055565b3090565b60075460ff1681565b600054600160a060020a031633141561069157600054600160a060020a0316ff5b565b60035490565b60606000805b6003548210156107565760038054339190849081106106ba57fe5b600091825260209091200154600160a060020a0316141561074b576040805160e560020a62461bcd02815260206004820152603360248201527f4572726f722c2074686520686569722068617320616c7265616479206465636c60448201527f6172656420746865206f776e6572206465616400000000000000000000000000606482015290519081900360840190fd5b60019091019061069f565b5060005b60015481101561095457600180543391908390811061077557fe5b6000918252602090912060029091020154600160a060020a0316141561094c5760018054829081106107a357fe5b600091825260209091206001600290920201810154600480549091019055805460039190839081106107d157fe5b6000918252602080832060029092029091015483546001810185559383529120909101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a039092169190911790556004546050116108c2576005805460ff191660011790554260065560408051608081018252605381527f546865206f776e6572206973206f6666696369616c6c79206465636c6172656460208201527f20646561642c206120372064617973206c6174656e6379206973206e65656465918101919091527f6420746f20636c61696d207468652077696c6c0000000000000000000000000060608201529250610954565b608060405190810160405280605d81526020017f5468652068656972206f6666696369616c6c79206465636c617265642074686581526020017f206f776e657220646561642e204f746865722068656972732077696c6c206e6581526020017f656420746f206465636c61726520746865206f776e657220646561642e0000008152509250610954565b60010161075a565b505090565b600054600160a060020a031690565b60008054600160a060020a031633146109f1576040805160e560020a62461bcd02815260206004820152602c60248201527f4f6e6c7920746865206f776e6572206f662074686520636f6e7472616374206360448201527f616e206164642065746865720000000000000000000000000000000000000000606482015290519081900360840190fd5b600254821115610a4b576040805160e560020a62461bcd02815260206004820152601e60248201527f4e6f7420656e6f7567682077656920696e2074686520636f6e74726163740000604482015290519081900360640190fd5b60028054839003905560008054604051600160a060020a039091169184156108fc02918591818181858888f19350505050158015610a8d573d6000803e3d6000fd5b50503031919050565b60055460ff1681565b303190565b6000805b600154811015610ba8576001805482908110610ac057fe5b906000526020600020906002020160010154600254029150606482811515610ae457fe5b049150600181815481101515610af657fe5b60009182526020822060029091020154604051600160a060020a039091169184156108fc02918591818181858888f19350505050158015610b3b573d6000803e3d6000fd5b507fb9f6cc65b3b9b7dc18152bc517c1783d9a9d5039e42b72918de9bd1a4b40487c600182815481101515610b6c57fe5b60009182526020918290206002909102015460408051600160a060020a03909216825291810185905281519081900390910190a1600101610aa8565b600054600160a060020a0316ff5b600154905600a165627a7a72305820766da26e437a33732e049f5180a4eb4ad93ede2b5e06441b5bc0ee89e96ed94f0029";
+    private static final String BINARY = "6080604052604051610e81380380610e818339810160405280516020820151908201910160008080808061003161039f565b600134116100a057604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4e6f7420656e6f7567682077656920616464656420746f20636f6e7472616374604482015290519081900360640190fd5b87519550865194506000861180156100b85750600085115b80156100c357508486145b15156100cb57fe5b60009350600092505b848310156102cd57600091505b6001548210156101d35787838151811015156100f957fe5b90602001906020020151600160a060020a031660018381548110151561011b57fe5b6000918252602090912060029091020154600160a060020a031614156101c857604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603560248201527f4572726f722c2074686520686569722068617320616c7265616479206265656e60448201527f206465636c6172656420696e207468652077696c6c0000000000000000000000606482015290519081900360840190fd5b6001909101906100e1565b604080519081016040528089858151811015156101ec57fe5b90602001906020020151600160a060020a03168152602001888581518110151561021257fe5b60209081029190910181015190915260018054808201825560009190915282517fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf660029092029182018054600160a060020a031916600160a060020a03909216919091179055908201517fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf79091015587519091508790849081106102b257fe5b906020019060200201518401935082806001019350506100d4565b6064841461036257604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602160248201527f546f74616c2070657263656e74616765206e6f7420657175616c20746f20313060448201527f3000000000000000000000000000000000000000000000000000000000000000606482015290519081900360840190fd5b505060008054600160a060020a031916331781556005805460ff19908116909155600780549091169055600455505034600255506103b692505050565b604080518082019091526000808252602082015290565b610abc806103c56000396000f3006080604052600436106100da5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166314fae21881146100df5780631c0795c314610106578063252d3b7b146101415780633641a7b71461014957806338cc48311461016057806357c9ca14146101915780635a58cd4c146101ba5780635eeddcaa146101cf5780636f92e149146101e4578063893d20e81461026e5780638bf3a17c1461028357806399baa10c1461029b578063a9c74a66146102b0578063aedb1c8f146102c5578063c039c432146102da575b600080fd5b3480156100eb57600080fd5b506100f46102ef565b60408051918252519081900360200190f35b34801561011257600080fd5b5061011e6004356102f5565b60408051600160a060020a03909316835260208301919091528051918290030190f35b6100f461032b565b34801561015557600080fd5b5061015e61049e565b005b34801561016c57600080fd5b50610175610537565b60408051600160a060020a039092168252519081900360200190f35b34801561019d57600080fd5b506101a661053b565b604080519115158252519081900360200190f35b3480156101c657600080fd5b5061015e610544565b3480156101db57600080fd5b506100f4610567565b3480156101f057600080fd5b506101f961056d565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561023357818101518382015260200161021b565b50505050905090810190601f1680156102605780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561027a57600080fd5b5061017561082d565b34801561028f57600080fd5b506100f460043561083c565b3480156102a757600080fd5b506101a661096a565b3480156102bc57600080fd5b506100f4610973565b3480156102d157600080fd5b5061015e610978565b3480156102e657600080fd5b506100f4610a8a565b60065481565b600180548290811061030357fe5b600091825260209091206002909102018054600190910154600160a060020a03909116915082565b60075460009060ff16156103af576040805160e560020a62461bcd02815260206004820152602560248201527f43616e2f2774206164642057656920746f206465737472756374656420636f6e60448201527f7472616374000000000000000000000000000000000000000000000000000000606482015290519081900360840190fd5b600054600160a060020a03163314610437576040805160e560020a62461bcd02815260206004820152602c60248201527f4f6e6c7920746865206f776e6572206f662074686520636f6e7472616374206360448201527f616e206164642065746865720000000000000000000000000000000000000000606482015290519081900360840190fd5b6001341015610490576040805160e560020a62461bcd02815260206004820152601760248201527f4e6f7420656e6f756768207765692070726f7669646564000000000000000000604482015290519081900360640190fd5b506002805434019055303190565b60055460ff161515610520576040805160e560020a62461bcd02815260206004820152602a60248201527f546865206f776e6572206973206e6f74206f6666696369616c6c79206465636c60448201527f6172656420646561642e00000000000000000000000000000000000000000000606482015290519081900360840190fd5b610528610978565b6007805460ff19166001179055565b3090565b60075460ff1681565b600054600160a060020a031633141561056557600054600160a060020a0316ff5b565b60035490565b60606000805b60035482101561062a57600380543391908490811061058e57fe5b600091825260209091200154600160a060020a0316141561061f576040805160e560020a62461bcd02815260206004820152603360248201527f4572726f722c2074686520686569722068617320616c7265616479206465636c60448201527f6172656420746865206f776e6572206465616400000000000000000000000000606482015290519081900360840190fd5b600190910190610573565b5060005b60015481101561082857600180543391908390811061064957fe5b6000918252602090912060029091020154600160a060020a0316141561082057600180548290811061067757fe5b600091825260209091206001600290920201810154600480549091019055805460039190839081106106a557fe5b6000918252602080832060029092029091015483546001810185559383529120909101805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a03909216919091179055600454605011610796576005805460ff191660011790554260065560408051608081018252605381527f546865206f776e6572206973206f6666696369616c6c79206465636c6172656460208201527f20646561642c206120372064617973206c6174656e6379206973206e65656465918101919091527f6420746f20636c61696d207468652077696c6c0000000000000000000000000060608201529250610828565b608060405190810160405280605d81526020017f5468652068656972206f6666696369616c6c79206465636c617265642074686581526020017f206f776e657220646561642e204f746865722068656972732077696c6c206e6581526020017f656420746f206465636c61726520746865206f776e657220646561642e0000008152509250610828565b60010161062e565b505090565b600054600160a060020a031690565b60008054600160a060020a031633146108c5576040805160e560020a62461bcd02815260206004820152602c60248201527f4f6e6c7920746865206f776e6572206f662074686520636f6e7472616374206360448201527f616e206164642065746865720000000000000000000000000000000000000000606482015290519081900360840190fd5b60025482111561091f576040805160e560020a62461bcd02815260206004820152601e60248201527f4e6f7420656e6f7567682077656920696e2074686520636f6e74726163740000604482015290519081900360640190fd5b60028054839003905560008054604051600160a060020a039091169184156108fc02918591818181858888f19350505050158015610961573d6000803e3d6000fd5b50503031919050565b60055460ff1681565b303190565b6000805b600154811015610a7c57600180548290811061099457fe5b9060005260206000209060020201600101546002540291506064828115156109b857fe5b0491506001818154811015156109ca57fe5b60009182526020822060029091020154604051600160a060020a039091169184156108fc02918591818181858888f19350505050158015610a0f573d6000803e3d6000fd5b507fb9f6cc65b3b9b7dc18152bc517c1783d9a9d5039e42b72918de9bd1a4b40487c600182815481101515610a4057fe5b60009182526020918290206002909102015460408051600160a060020a03909216825291810185905281519081900390910190a160010161097c565b600054600160a060020a0316ff5b600154905600a165627a7a72305820cef1d854d043be9ebcaca46cefc4b169e7c5ab69a9487f515be949f167366deb0029";
 
     public static final String FUNC_DEATHDATE = "deathDate";
 

diff --git a/java-projects/smarties/src/main/java/fr/insa/smarties/Will.java b/java-projects/smarties/src/main/java/fr/insa/smarties/Will.java
@@ -61,14 +61,12 @@ public int addEthToInheritance(int ethToAdd) throws Exception {
 
     public int removeEthFromInheritance(int ethToRemove) throws Exception {
         BigInteger value = BigInteger.valueOf(ethToRemove).multiply(BigInteger.valueOf(10).pow(18));
-        TransactionReceipt trReceipt = this._contract.removeWeiFromInheritance(value).send();
-        System.out.println(trReceipt.toString());
+        this._contract.removeWeiFromInheritance(value).send();
         return 0;
     }
 
     public int declareDead() throws Exception {
-        TransactionReceipt trReceipt = this._contract.declareDead().send();
-        System.out.println(trReceipt.toString());
+        this._contract.declareDead().send();
         return 0;
     }