From 98b6f72f90c1a67584a3c08e33f3682f57fb1f4e Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 23 Oct 2014 15:32:01 +0200 Subject: [PATCH] Use security deposit as flat rate instead of percentage, remove wording of collateral --- src/deploy/package/shortcut-32@2x.png | Bin 6301 -> 0 bytes src/main/java/io/bitsquare/SeedNode.java | 6 +- .../io/bitsquare/arbitrator/Arbitrator.java | 56 +++------------- .../profile/ArbitratorProfileView.fxml | 2 +- .../profile/ArbitratorProfileViewCB.java | 11 +--- .../ArbitratorRegistrationView.fxml | 6 +- .../ArbitratorRegistrationViewCB.java | 62 +++++------------- .../restrictions/RestrictionsModel.java | 7 +- .../orders/pending/PendingTradesModel.java | 6 +- .../main/orders/pending/PendingTradesPM.java | 10 +-- .../orders/pending/PendingTradesView.fxml | 4 +- .../orders/pending/PendingTradesViewCB.java | 16 ++--- .../trade/createoffer/CreateOfferModel.java | 34 ++-------- .../main/trade/createoffer/CreateOfferPM.java | 14 +--- .../trade/createoffer/CreateOfferViewCB.java | 6 +- .../main/trade/takeoffer/TakeOfferModel.java | 19 ++---- .../gui/main/trade/takeoffer/TakeOfferPM.java | 18 ++--- .../main/trade/takeoffer/TakeOfferViewCB.java | 4 +- .../io/bitsquare/gui/util/BSFormatter.java | 53 ++++++++------- .../java/io/bitsquare/settings/Settings.java | 15 ++--- src/main/java/io/bitsquare/trade/Offer.java | 16 ++--- src/main/java/io/bitsquare/trade/Trade.java | 4 +- .../java/io/bitsquare/trade/TradeManager.java | 2 +- .../createoffer/tasks/VerifyOffer.java | 8 +-- .../offerer/BuyerAcceptsOfferProtocol.java | 7 +- .../offerer/tasks/SendSignedPayoutTx.java | 6 +- .../trade/taker/SellerTakesOfferProtocol.java | 6 +- .../trade/taker/tasks/PayDeposit.java | 6 +- .../resources/i18n/displayStrings.properties | 7 +- .../trade/createoffer/CreateOfferPMTest.java | 8 --- .../uimock/CreateOfferControllerUIMock.java | 51 ++------------ .../msg/dhttest/DHTTestController.java | 2 +- 32 files changed, 147 insertions(+), 325 deletions(-) delete mode 100644 src/deploy/package/shortcut-32@2x.png diff --git a/src/deploy/package/shortcut-32@2x.png b/src/deploy/package/shortcut-32@2x.png deleted file mode 100644 index 6a207469319f547d63c117ed8ef81d49982de556..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6301 zcmeHMXHZk?x?Uh%>1|UDh=M{$p-CX2g(eVsFA_+QKu9742>}#j3nD7LilPXLNRc8) zN0BCNBNmDU5UC2%t8n5z`*`lXGk50fANR+dam}ptt+n3gd*1hZzGuz6Gb_#tW6aGZ z&IJGfx2Xx*hB4~?I62rD*CN8%4~#*KYUo6@CHqiAuz`3$4@dUGgG>XkXYe+7EH3nH z7hW3x4l)z$oTyF~<_K?cfHL+6Mwu2sVax^qZ5+O%Hg1qo&2qdKJVtunLh=4=N zI;vSfEhq+fUxEoe5N}Jz*m=|ay)|*NIw&q}8iGL(fTvh7A-2ZqD zkp=w;q530b|5=oig%!wv9Eb<0D#MlGU~j0p3P?>wSw#)54p&tI!J*KT5U2)31qz0p zL_pOLsxZ)Bhb)Q&<{?m7de=Ul$B+~LH}Ay0Ocn+Dd;b~ z7|KCtSPBHD42AqxFwXlYmJ%FD{Id+4Hv~__2jEH6AO;@x-|!S)GL;_Z?jVnH^>`XEz719h0Dx;hxH43mZYa0cWrYcO01 z`Dx1^`~81^{7Uk-H2x*mFS-7f0)Gqq%U!?Z`dbS8E$}aQ{r{4S>)(wnp2X;8Ll|wV z+@q^_Mk@_7MeEtoMkZbTDfX|0JvJgzZiH|o$njlGj1rO+5-6YW{{~~WF_bF$wAsR+ zSpN9y$-z?{S>jUn3mzL7>(1ov6`m_Bu`yDBo2Y?c`jIjX`m|#*k)eqly%9Q?w>68J zU78xT36rgBFH&zN~$H{MO~;$h5eeX`Y;mdbeBpsIyPGxzBOWE}W@%`J+s` z4T;(2!DmJNGU-5kMqAg*r!RY6w%Byo^ap|mB4bzpbG&ogvVz(1h#K*hp}u8QcU%&4 zq_BJIvbY&rM2&>fWP%d8f|ktWDcK#Xba1BK@3E3)dDZg+o=V-yp}8L~m&AQ$QseLg zlq!}t2ClsylU&4}H4d9s(}-G@Gp?+;3kIb3o=CnV#fadtq7xrDwIq;bKM(XM={PEZ z%sjrw(RB)%n{z#}Sy@>}7DlI52W$PMxz6q<6SdN&M%HdgC+E-V=Gj<&ZuEeB9j=V! zkwT!~zkfgBLLw>m-a_6GQF79qot-_qqj8QtQ_?6(=)WXAx5UCBp*rZ7S2Urt{o4H~ zb^5tdR9CEh0%2}$or z8YQQjZz+2;nDE3#7dt2_dI~W^DJ72|+rNu0;eW4O*`-tSIH|PuK&rP&lBt7qFYdBa z)bstuhP!cdkd1lPmP2>Vi8iGAkVTOf9V$yzRjPgj!kvE94zV+2p0~<6C?QtT;Ygd8 zyaQX?XWjwwdd&=Li`?CwIU7Id()KpJd~T^zxT$iONZtH~0}kEC*l ztd2P-BtQWoQ$LxVloWaB5B)8SCGpcnkOEIvpRQfy+uu@ zeoI#&6iAYw86-;snOEs{WH;rEp}{zzmJL*Hf=^GT-npIIZtHsO$@SQjTPBxpPId8Qkbrzl#f@yQg zz|Swz?5u8cYoDgP5lxTIm6Jy?IS43%tJyEKtF_I5C3%umXAQY*FcAq-TE`l+dL+Um zyLk81Uu=5yJKEb197)jD7d&SE$LiuT3t=Zqd3}LxZsk(v3lgf^#|O4FZL$v}4EKLr ztDr?=;VJ;fCGM}vMZe8IX#zk@ek9U8n0NahsmE;#i;K+_veMFy+F&CSGcrU|_!{j8 z&3lVG19Cp?Q$~KPtCzbGXDR-9q!$MhV_W_mMZTOJ*0{P>fEsx-WV$o#_a^*&RJ9KB zh#G6Y&`8n|PjDK zR$i+=KkuUI31H||!A-4@Q~f&o4OJ04>--x!ug8#tGTZ!rDg)Qj*zu$_IX;fg%oIy5S}{fyIb z?yJcW-7I@tCGp zu&-;86DLdc03$=gHongrfxg=V9rClMa!)@(Sh?UdervlY-rWV;-*XL&QQ*athptRT z6*4~!VtT&xspCO)b-F`|OTh#AG5&;#mECNx;;8!Op|zs*o#<7|b2;^))*p^vpUlj+E|vG}<^cdm?qnFVIEam1 zjl(oM>NgXW@uWWpM{RB=oNJcf507?p5(9t_l3_YorY(xbmY&6}`i5ERPiFTR~FTDNnm2$Dwft1gx$K27lqJ5 z51WUg^6YpA7vdz9mv&w4JBZm?b`B0)F7*MU>UThqR-&*p4uBl7I%DlpM}2Ti+`OxD zusOH>n)=~7S$LUQj;N=LZiJ~bs4^CY$O#ueZP%|9Ja9_+(9T5^~B%D+&p39e$prMAZU4IrR~|F zx997d)6Q>|sn{X<^bX#i8blt|v`f!zcktnlXDc! zbv?Teo+&`qB77Zrd{=y$+%bC8HTc@#1X|u?Y|l%^Ixcaxx+T>p zvT%)Z?6J6V@$h!|f{-gyy>}f?M+9%SzR}Gb$w{I!7gFzQb=r+u>}0J)gqFv;Al_9? zT=zQb67KGQu{#}nS5O|qaX(I$lg7Nv1>DZBrVs((s^B>0f&A^oM1gum-R81@0?Qk9 z=&z@fyT?qZyA$7jN0(QDIxzkVCu;ZXvBl~<2&^{EO5_5@?b!8(PNDH?J{^%l!oq~ofTCve zj?(pbl_)fZGu=8pw={MS>kjC8+?sh0sAVxZ&ACaNzN>CmuDC+KnEL1zFt1=zGs6_g z0@$1%)IIKgRKhB6o)fy?{T|6- z^2@v42vT?#><_2O*n@qV_&DUNL74BFkE=Pn?ivI!MfTYl>wPgsGL3_?T$nc->Nc;m zxgi=OccUo!s70R-`+uamF=g|76$hRac9`($>^@RRZGR{~rZvelu*iP9BvU2oM119Q zPD(LcWHX$gli58Q93_Z*E>F+>Uf0kB1$bo>?FH!bypWr6}Egd%1J1hV=f#o_#e-wF!Z6 z9JxN^{cQJ>niKFrjHQEJ6rk~=a?NyZI4Xr-y8e|Dh@6u>Z)aCH-RW5B#vl724`gk{ zx3V@wYcr!nJpx+v)l(L9(5+$g&o35P)himzH5^BuEvGWKsHWdFsUQh_zC#r@YxHuw zrZi8=d%Z7ccwQ@iYd{FY)pWbF%z!+}b|FN5H$YX&h;!5Q%5K#cqks}6GvUv%5820J z*qxhdnbM4#R&-aHc|~0*wCgS#hgUtX?6Y%ktsP6RcgFB`K?SXbhLy@5Ddlxq`Zb%C z*kZoD>8SKINS2g-(VrrPV>LXFOY6V*Rx>dp8}Bc!St;etkusUa{emhD;rVna%1mgB k)$L|6)iv+w-jNny=?=Z8A(b=x#}5NjLkzl9-}B->0IJ)8W&i*H diff --git a/src/main/java/io/bitsquare/SeedNode.java b/src/main/java/io/bitsquare/SeedNode.java index 73be31f708..a28056f95b 100644 --- a/src/main/java/io/bitsquare/SeedNode.java +++ b/src/main/java/io/bitsquare/SeedNode.java @@ -48,10 +48,10 @@ public class SeedNode extends Thread { private static final List staticSedNodeAddresses = SeedNodeAddress .StaticSeedNodeAddresses.getAllSeedNodeAddresses(); - public static void mainForTest(String[] args) { - Peer peer = null; + + public static void main1(String[] args) { try { - peer = new PeerBuilder(Number160.createHash("digitalocean1.bitsquare.io")).ports(5000).start(); + Peer peer = new PeerBuilder(Number160.createHash("digitalocean1.bitsquare.io")).ports(5000).start(); new PeerBuilderDHT(peer).start(); new PeerBuilderNAT(peer).start(); diff --git a/src/main/java/io/bitsquare/arbitrator/Arbitrator.java b/src/main/java/io/bitsquare/arbitrator/Arbitrator.java index 48ae03be9d..87d1bb1c20 100644 --- a/src/main/java/io/bitsquare/arbitrator/Arbitrator.java +++ b/src/main/java/io/bitsquare/arbitrator/Arbitrator.java @@ -17,6 +17,8 @@ package io.bitsquare.arbitrator; +import org.bitcoinj.core.Coin; + import java.io.Serializable; import java.util.List; @@ -33,11 +35,7 @@ public class Arbitrator implements Serializable { private ID_TYPE idType; private List languages; private Reputation reputation; - private double maxTradeVolume; - private double passiveServiceFee; - private double minPassiveServiceFee; - private double arbitrationFee; - private double minArbitrationFee; + private Coin fee; private List arbitrationMethods; private List idVerifications; @@ -54,11 +52,7 @@ public class Arbitrator implements Serializable { ID_TYPE idType, List languages, Reputation reputation, - double maxTradeVolume, - double passiveServiceFee, - double minPassiveServiceFee, - double arbitrationFee, - double minArbitrationFee, + Coin fee, List arbitrationMethods, List idVerifications, String webUrl, @@ -69,11 +63,7 @@ public class Arbitrator implements Serializable { this.idType = idType; this.languages = languages; this.reputation = reputation; - this.maxTradeVolume = maxTradeVolume; - this.passiveServiceFee = passiveServiceFee; - this.minPassiveServiceFee = minPassiveServiceFee; - this.arbitrationFee = arbitrationFee; - this.minArbitrationFee = minArbitrationFee; + this.fee = fee; this.arbitrationMethods = arbitrationMethods; this.idVerifications = idVerifications; this.webUrl = webUrl; @@ -90,11 +80,7 @@ public class Arbitrator implements Serializable { this.idType = persistedArbitrator.getIdType(); this.languages = persistedArbitrator.getLanguages(); this.reputation = persistedArbitrator.getReputation(); - this.maxTradeVolume = persistedArbitrator.getMaxTradeVolume(); - this.passiveServiceFee = persistedArbitrator.getPassiveServiceFee(); - this.minPassiveServiceFee = persistedArbitrator.getMinPassiveServiceFee(); - this.arbitrationFee = persistedArbitrator.getArbitrationFee(); - this.minArbitrationFee = persistedArbitrator.getMinArbitrationFee(); + this.fee = persistedArbitrator.getFee(); this.arbitrationMethods = persistedArbitrator.getArbitrationMethods(); this.idVerifications = persistedArbitrator.getIdVerifications(); this.webUrl = persistedArbitrator.getWebUrl(); @@ -127,17 +113,14 @@ public class Arbitrator implements Serializable { return id != null && id.equals(other.getId()); } - public String getId() { return id; } - public String getPubKeyAsHex() { return pubKeyAsHex; } - public String getMessagePubKeyAsHex() { return messagePubKeyAsHex; } @@ -152,57 +135,34 @@ public class Arbitrator implements Serializable { return name; } - public ID_TYPE getIdType() { return idType; } - public List getLanguages() { return languages; } - public Reputation getReputation() { return reputation; } - public double getMaxTradeVolume() { - return maxTradeVolume; + public Coin getFee() { + return fee; } - public double getPassiveServiceFee() { - return passiveServiceFee; - } - - public double getMinPassiveServiceFee() { - return minPassiveServiceFee; - } - - public double getArbitrationFee() { - return arbitrationFee; - } - - public double getMinArbitrationFee() { - return minArbitrationFee; - } - - public List getArbitrationMethods() { return arbitrationMethods; } - public List getIdVerifications() { return idVerifications; } - public String getWebUrl() { return webUrl; } - public String getDescription() { return description; } diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml index ceb85b3167..04484df0f5 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml @@ -43,7 +43,7 @@ GridPane.rowIndex="4"/>