Skip to content

Commit

Permalink
chore: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
dr-orlovsky committed Sep 20, 2024
1 parent df371d7 commit 673e970
Show file tree
Hide file tree
Showing 11 changed files with 80 additions and 90 deletions.
7 changes: 3 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,6 @@ wasm-bindgen-test = "0.3"
features = ["all"]

[patch.crates-io]
rgb-invoice = { git = "https://github.com/RGB-WG/rgb-std", branch = "develop" }
rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "develop" }
rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "fix/273" }
rgb-invoice = { git = "https://github.com/RGB-WG/rgb-std", branch = "fix/rgb-252" }
rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "fix/rgb-252" }
Binary file modified interfaces/RGB20.rgb
Binary file not shown.
44 changes: 22 additions & 22 deletions interfaces/RGB20.rgba
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
-----BEGIN RGB KIT-----
Id: rgb:kit:fP4LP8j8-W9c!zB5-YqWBB$A-P6g66Ou-rQATu2M-T2CeKOw
Id: rgb:kit:rkBGk37g-KX3CPhg-4kytJa3-FI7gQJG-rPElGuq-Ya3vC$Y
Version: 2
Interface: RGB20InflatableBurnable;
id=BWy2H0Nd-ykgandr-mR5fydi-U$7tFU2-R!z1F9B-MZW0tKo#bishop-poem-dublin;
dev=ssi:LZS1ux-gjD9nXPF-OcetUUkW-6r3uSCS6-aQhs9W5f-8JE7w;
suppl=jVFbvP4NfeUiD7V9u4Z0Yaq7a5ivOkMvfVAcJkhkuto
suppl=hwNKARI0FMsV5mr8LTkJaAMSlxQo2x5LP6WdvGTZoBs
Interface: RGB20RenamableBurnable;
id=FFfPPWDH-4$BWBn7-3QnE8WV-nHj98E8-IoAIZvt-4kiX7YA#theory-memo-puzzle;
dev=ssi:LZS1ux-gjD9nXPF-OcetUUkW-6r3uSCS6-aQhs9W5f-8JE7w;
suppl=woxY7TXVP1or9vUCIgv4btc27FNoElyBF!ER5cE7V30
suppl=fWWlgwPDFRW69ZTzqiVPWJGEOr!HhZBzUhhpAhD3y2s
Interface: RGB20RenamableInflatable;
id=Gzd3DwVy-TtF3Z6V-h981qjU-WV9QmbS-$SB5Tyg-6y5PLPc#battery-consul-mercury;
dev=ssi:LZS1ux-gjD9nXPF-OcetUUkW-6r3uSCS6-aQhs9W5f-8JE7w;
suppl=0N0774KBnZeW!fF2ABAlDsqIi!anU$opxl9m0lR7erc
suppl=Tn6z5oWY0iFNb$V9OvG9RhtaxAegEjtn46WUpotzNt0
Interface: RGB20RenamableInflatableBurnable;
id=MkSuvvz2-StGzuV8-Hewq0fo-hMigWm$-UMxXtdP-RCnZyec#asia-domino-respect;
dev=ssi:LZS1ux-gjD9nXPF-OcetUUkW-6r3uSCS6-aQhs9W5f-8JE7w;
suppl=w$fGswNCSc$SvLDaAtkRr3oC8lo$MdSDVmrT2jZYS48
suppl=7P62AIaAy882ZBa7sKbh4Xiii$cwS0Cj6u9ZFaoLqS8
Interface: RGB20Inflatable;
id=YLpmbnY2-yZn$JdG-ghjwoCP-zj215y0-$XuwA90-o$CP$pg#camel-slogan-comrade;
dev=ssi:LZS1ux-gjD9nXPF-OcetUUkW-6r3uSCS6-aQhs9W5f-8JE7w;
suppl=NyZIrB5pQtjFEocL!vZP7yPmOFfFZWBhF4Rz1euUcRY
suppl=dYkHYQYc7n0FNZOvbXbyk26TngaKM7bzxJRNVJU8VYk
Interface: RGB20RenamableFixed;
id=meHrtVTZ-6xAdd0w-rjDttLh-cs2n7zn-sZBzfwz-FcU!i24#jungle-wizard-dollar;
dev=ssi:LZS1ux-gjD9nXPF-OcetUUkW-6r3uSCS6-aQhs9W5f-8JE7w;
suppl=orMy!IoDYoMShipfxkHs8qRcvcb5Z$vm3$lqbUrO8LQ
suppl=7vFkR1M82PYyCUlbdI!VRADuErRZrPov2Fc5x6ujJJc
Interface: RGB20RenamableReplaceable;
id=r6$dLeVy-H0HQpUy-F2XbX2E-P2JqbHp-wsISD4f-xUEaOKQ#postage-plaza-almond;
dev=ssi:LZS1ux-gjD9nXPF-OcetUUkW-6r3uSCS6-aQhs9W5f-8JE7w;
suppl=twB$9UYdTZArH3KDU0TphqgJ!qjqhD4mVM5Py3xeEf0
suppl=JXHKgJeiGx9ORN9AaJ$35Gl1lUeskUq7zYlUIfR7Ooo
Interface: RGB20Replaceable;
id=w0Z1Za2j-klpfWyT-4coOB!6-90qakW5-AfjmIc9-ejZbKZU#cycle-buzzer-british;
dev=ssi:LZS1ux-gjD9nXPF-OcetUUkW-6r3uSCS6-aQhs9W5f-8JE7w;
suppl=gP$QpkRegHiMBUDOvKIJhFTkMvH0MUVUCy8hnW7sv!A
suppl=kxo1RuJIv$jx$wBL9v9qXdltbDUMFiik2PUWJFh7Tq4
Interface: RGB20Burnable;
id=yxQRcNJ4-yMnJ0$c-gLjwpdS-8DuJjFn-pWQ4i5C-To2R$U4#basil-gopher-music;
dev=ssi:LZS1ux-gjD9nXPF-OcetUUkW-6r3uSCS6-aQhs9W5f-8JE7w;
suppl=J$6n9hMEF5bIYpyIJxbErWQoMZUnLZSvII12uwaopKs
suppl=ActJyKiLYgrF4aOzHoqxEsOl5r$V3p0VbfqN$hCnGnM
Interface: RGB20Fixed;
id=$iUnO9aO-1xhqUd6-1Jm5S5!-wM3ngby-5GVEylQ-ZTAMYDk#tornado-pioneer-bucket;
dev=ssi:LZS1ux-gjD9nXPF-OcetUUkW-6r3uSCS6-aQhs9W5f-8JE7w;
suppl=A!S5COe4XrAEz5qH$$!PCTZNVfdCNicgKCtL12$c4JU
suppl=vs0oZVfUdW73Bxno8ebclKF6k1hCoxTJxPYrumSZQxQ
Type-System: sts:3Vut1$G8-lmJY9!z-CvaNdjp-n0adNAj-IVQQ1jB-SdhQxp4#parker-axiom-meaning
Check-SHA256: abe88631b64337f76fa37a5ca277f043cb10715c4d68e925150881718a02cd51
Check-SHA256: 7bb82626cf537cdf39f60d103a509a6e856f00a8e4aebd059d845fed467de585

0tx{aQb$5EFiCD^Y+-a^Vr*qXb#iWDVr*pwR!>~x^Kusb3F_D>3|%=0P4(J<mWA;RHt3oehQzyH*K>M3
91~BkJ``pp2L<+WYM!zJb=Ey6LPIrKAc+<}ouO+1_y#HazXRttFXqDki#07`P*;L4`>n3v9olck(HKSg
Expand Down Expand Up @@ -266,28 +266,28 @@ W@%+)AYpSLVIXI0Z(?C=AaG%FVQpn}WpW^7Z)J0CCv+ffVRU0?AarPDAZc@Rb!B8Ab9HcVY<VDIY;131
VRU6=AarjabZBKDVRLh3bRchcZe?<F4{mR6MR9duY(Z^rb#8QXMRaIoAaiwXAa7<Mb8uyDbRc1Kb7gdM
AY^Z4b8aVeAZ2lNVQe6DZy<DNWgv5PZ6I%EAYpTJWpr~OX>K5Ib#!obbaONSb8~4rOj=Vhb$BgjYD771
SWreSPh(|tRaI+OEjDs9byGuAHZ5UMXmdGNHD)b1N<}w!000UC1#Gq-LtV;98lBqaN0;(;B|q-bRM{W1
)L%g{m9(^~Esoh{00000GyrpRX*x_=Q!#aTEoW*(Ic```MlDZcWpq_lYga8cax-;PLsK>_VNqyvIaf7i
)L%g{m9(^~pY!cz00000GyrpRX*x_=Q!#aTEoW*(Ic```MlDZcWpq_lYga8cax-;PLsK>_VNqyvIaf7i
EjUU=H+KO50RRFBMrC1ib#i5M6#xPVVs&zEVPb4$3TbX;Y+-a^Vr*pyQ*>c&WMOh-1^@+8M?x|%0u)!z
Jz&S<@Ky$X_d;<zSy{)A-vscA03n<0;z*b6fG&>NW&i*H05kw|b7?wET2nD~cr9mYL^*C)P)03JV`X$z
Jz&S<@Ky$X_d;<zSy{)A-vscA03n<0;z*b6fS~j3W&i*H05kw|b7?wET2nD~cr9mYL^*C)P)03JV`X$z
Rclu*HgYp{Q$tfWEn!h;b2(QvW-T~MMK^Z=009632u5XLbairNa})pq2x4_|Zee0<WeIX+ZeeX<Vr*py
Q*>c&WMOh-1^@+8M?x|%0vk7X4+U~g(RXL1VfW2yjYXC937bpwf#p1)>n=|$_b!gvW&i*H05kw|b7?wE
Q*>c&WMOh-1^@+8M?x|%0vk7X4+U~g(RXL1VfW2yjYXC937bpwf#p1)>n=|$_n`CbW&i*H05kw|b7?wE
T2nD~cr9mYL^*C)P)03JV`X$zRclu*HgYp{Q$tfWEn!h;b2(QvW-T~MMK^Z=009632u5XLbairNa~1#s
3TbX;Y+-a^Vr*pza%FB|ZDC?;We8JrVQyq$a%2Vo1yV;sGB5%%M6SO4_Da#SxnBo+3bcNROo|1j{X;Qc
*H1(#*~#ZFj@f1a0000q0CRI`I!szqF?Dz?XKF+_Zdg!8El*=*bX8SrS1mSjGj&r#Q#LJOQD}2HS2boW
*H1(#*~#ai^X+B;0000q0CRI`I!szqF?Dz?XKF+_Zdg!8El*=*bX8SrS1mSjGj&r#Q#LJOQD}2HS2boW
I7&q~cL4wa00Ia`Wnpx6a%FQL00RhOb#iWDVr*p!X>Mk0VRT_)Y-I^@Wo}_@VPb4$2vc-nZe(F{WCj2Q
Qb$5EFalt@W^Q&i$(jEp(V&JrC<y%H+g@_h_3pqAbffT({+KO}*=7I$001-qb8~4rOj=Vhb$BgjYD771
Qb$5EFalt@W^Q&i$(jEp(V&JrC<y%H+g@_h_3pqAbffT({+OTh?PdS~001-qb8~4rOj=Vhb$BgjYD771
SWreSPh(|tRaI+OEjDs9byGuAHZ5UMXmdGNHD)b1N<}w!0RRC20tiNBVRUtJWpfMw0SakuW^7?}VPb4$
2vc-nZe(F{WCj2QQb$5EFanw3>$Ozb>ku7xOe>5#Z7vrq+J5t%#zD>eGZn=?i*7BB*=7I$001-qb8~4r
2vc-nZe(F{WCj2QQb$5EFanw3>$Ozb>ku7xOe>5#Z7vrq+J5t%#zD>eGZn=?i*BFu?PdS~001-qb8~4r
Oj=Vhb$BgjYD771SWreSPh(|tRaI+OEjDs9byGuAHZ5UMXmdGNHD)b1N<}w!0RRC20tiNBVRUtJWpfJv
0SR(tZeeX<Vr*pyQ*>c&WMOh-1^@+8M?x|%0<W*#E#-0_LC~d4h1qu3*hBUvrpKoX2uMC3#X%Z4q%Mxx
0SR(tZeeX<Vr*pyQ*>c&WMOh-1^@+8M?x|%0<W*#E#-0_LC~d4h1qu3*hBUvrpKoX2uMC3#X%Z4q@eTd
W&i*H05kw|b7?wET2nD~cr9mYL^*C)P)03JV`X$zRclu*HgYp{Q$tfWEn!h;b2(QvW-T~MMK^Z=00963
2u5XLbairNb1MJ@2x4_|Zee0<WeRC-W^7?}VPb4$336p_VQpbzY-I~_WpHd^V`X7tY-I>jbYX5}VRB>!
00mM<LNYJ{!$x&wt)r4!Ut1*ja)W{UuXL%Y7UT!xn1?-jHd`r`Esoh{00000GyrpRX*x_=Q!#aTEoW*(
00mM<LNYJ{!$x&wt)r4!Ut1*ja)W{UuXL%Y7UT!xn1?-jHd`r`p!4l!00000GyrpRX*x_=Q!#aTEoW*(
Ic```MlDZcWpq_lYga8cax-;PLsK>_VNqyvIaf7iEjUU=H+KO50RRFBMrC1ib#i5MApipiVs&zEVPb4$
3TbX;Y+-a^Vr*p#a%FIAVPj=sVr*pyQ*>c&WMOh-1^@+8M?x|%0?QN;aMF0l$;s3AATB&9buR<Bn8luz
km4>vPK}ZMPA!hvW&i*H05kw|b7?wET2nD~cr9mYL^*C)P)03JV`X$zRclu*HgYp{Q$tfWEn!h;b2(Qv
km4>vPK}ZMPM`DbW&i*H05kw|b7?wET2nD~cr9mYL^*C)P)03JV`X$zRclu*HgYp{Q$tfWEn!h;b2(Qv
W-T~MMK^Z=009632u5XLbairNa|!?f2x4_|Zee0<We8JrVQyq$a%2Vo1yV;sGB5)EB_})9j@KA!QQoyC
Zc^v$4BmJf%aN56DNtoF3}87ej@f1a0000q0CRI`I!szqF?Dz?XKF+_Zdg!8El*=*bX8SrS1mSjGj&r#
Zc^v$4BmJf%aN56DNtoF3}88*^X+B;0000q0CRI`I!szqF?Dz?XKF+_Zdg!8El*=*bX8SrS1mSjGj&r#
Q#LJOQD}2HS2boWI7&q~cL4wa00Ia`Wnpx6a%FP?000P6bYX5}VRB>!00mM<LNYKb000X1U)Cjo-i6E2
P9x&mnv%Qki+Oba;k67*blZ=H=TQh>UMA(m1w0!?L{VGDpk+OvDhHAKF%fNXr25$w;Zs!r0000000007
000000000E(i%G%h4}Sf8vn;89aSG|t4s0*&BRFk%a^yrND0jb0t9t*cyH)xK+Rkw`Mu(V|7oQWGN(Z+
Expand Down
Binary file modified interfaces/RGB21.rgb
Binary file not shown.
12 changes: 6 additions & 6 deletions interfaces/RGB21.rgba
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
-----BEGIN RGB KIT-----
Id: rgb:kit:0kOWGdGC-3dj$BWI-fTZ9MNE-wQha!NY-fYXOQ$H-CN$zepc
Id: rgb:kit:NYvLHd4g-aog4Oz$-ZjWJJtz-iKdOImJ-9U9tH10-hWBvQgo
Version: 2
Interface: RGB21Issuable;
id=MTbC0xIy-t4kjnRO-6lrefMT-QDDxtSN-SNOHen$-WEeyyfc#cubic-motif-corona;
dev=ssi:LZS1ux-gjD9nXPF-OcetUUkW-6r3uSCS6-aQhs9W5f-8JE7w;
suppl=WkDQlqqAYb47f2Aufy!BVRGqn7kVqPexdRKWS8wr$2k
suppl=ZHXpK8I4SysWFz3LQLfshLbo4RLUWBnSiCt2uU4$q84
Interface: RGB21Unique;
id=zaiUh27F-2cYWfcd-FfL5lBc-uUenO66-IYZE0D9-GeVIvGU#forest-heroic-energy;
dev=ssi:LZS1ux-gjD9nXPF-OcetUUkW-6r3uSCS6-aQhs9W5f-8JE7w;
suppl=gFmKe4lnnxQQzD!IrZsAcUWlQkSYfh$5EwGClOhyOxM
suppl=LDm0JMzpP1yeC!0J0mCjIA4r0WLxzr8aMnXR98haDLI
Type-System: sts:khmpaMuX-TkN$aWG-9khkPeS-s7byD4Q-VtuwEzF-2bqkUZc#alien-phone-bagel
Check-SHA256: 0990d392dadbb1ba0185cf2aab9dcb9d62a191af0dda5ba4844527e481b1ead6
Check-SHA256: 96812bdd94b205ee024b5c0b50c3feaa3d42d582662d97f37c4088337b764c44

0s;XIQb$5EF-dcCbzx#`We8SJT;ua{7X1n8*eMKMIS5Vl+JKgY@eMZUni+<~yI*pqgJC?_Ngk-C4>AJ<
*4uOk<_EsKqDt~i^2VW=;sVUJc^^_AA?HnP4dl)m7&~2db~aWFA>JNQ2jD2sV9r$e#NPRGODlp?H>{w_
Expand Down Expand Up @@ -59,9 +59,9 @@ AY^Z4b8aVeAZ2lNVQe6DZy<DNWgv5PZ6I%EAarkQWo{s5a$#e1X>V?GAZczOZ*_EVb#!wQZf|Zza$#e1
X>V>}Y*cS+Wo|fObaZ8HaC9JaZy<DXVQzC~WpW^4AZBu5V{~b6ZXj=FAZ~ANEoO3IV{~b6Zee0<Wgv8K
Yh`W>b#7~JZ+C7~Z);_49${>3Z)0I}X>V>IZ)PBMZfkCDcWxkbZ);_4AW1|t0CRI`I!szqF?Dz?XKF+_
Zdg!8El*=*bX8SrS1mSjGj&r#Q#LJOQD}2HS2boWI7&q~cK`qa0x>qi(-Jbbi6fm8x|X+}F*E}Y8&WkR
P95q0SVywS_b!gvW&i*H05kw|b7?wET2nD~cr9mYL^*C)P)03JV`X$zRclu*HgYp{Q$tfWEn!h;b2(Qv
P95q0SVywS_n`CbW&i*H05kw|b7?wET2nD~cr9mYL^*C)P)03JV`X$zRclu*HgYp{Q$tfWEn!h;b2(Qv
W-T~MMK^Z=009632u5XLbairNb1VP^3S)0<Y-M9~X>V={Wo~D3VRm6+Y-I{&a$#e1X>V>}YzcB@ZeeX<
Vr*pyQ*>c&WMOh-1^@+8M?x|&0?nwDhi=8$#uk0YMSQ+x1<RCrbGqn;852PL8Rba4WiF1{W&i*H05kw|
Vr*pyQ*>c&WMOh-1^@+8M?x|&0?nwDhi=8$#uk0YMSQ+x1<RCrbGqn;852PL8Rba4WuWuzW&i*H05kw|
b7?wET2nD~cr9mYL^*C)P)03JV`X$zRclu*HgYp{Q$tfWEn!h;b2(QvW-T~MMK^Z=009632u5XLbairN
a}xjp3TAR)V{~b6ZeeT&b#7^Kb!7-sbYX5}VRB>!00mM<LNYNt000X1U)Cjo-i6E2P9x&mnv%Qki+Oba
;k67*blZ=H=TQh>UMA(m1w0!?L{VGDpk+OvDhHAKF%fNXr25$w;Zs!r0000000007000000000Es;(M&
Expand Down
Binary file modified interfaces/RGB25.rgb
Binary file not shown.
12 changes: 6 additions & 6 deletions interfaces/RGB25.rgba
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
-----BEGIN RGB KIT-----
Id: rgb:kit:P!Ecs7UR-r5FQi4m-XjsAofs-pLvMJQ!-cFpUdIZ-9WRR2hs
Id: rgb:kit:8mXeEnUx-EyzZlTk-0MO3Cl7-seOaZ7A-pd88Ig2-J!pAl!E
Version: 2
Interface: RGB25Base;
id=BdKiMHub-RZTYrbS-13G3wt6-4uIchyP-MQF0Kmm-sYgeMkY#prism-cobalt-airport;
dev=ssi:LZS1ux-gjD9nXPF-OcetUUkW-6r3uSCS6-aQhs9W5f-8JE7w;
suppl=Fgx32zFpZjbIvvfg5qbNNA8vgq694AzJMYYFOioKY8w
suppl=CmqfSmozlZRuQtv9v5Ub3pNh2lDomOB!30nhusj9S1M
Interface: RGB25Burnable;
id=CQLcyFgc-TMChxZQ-6$8Owdz-HOytrmh-T9QD8tL-eHy8ZUE#raymond-promise-bamboo;
dev=ssi:LZS1ux-gjD9nXPF-OcetUUkW-6r3uSCS6-aQhs9W5f-8JE7w;
suppl=R1Vx!YgQMRIHBGFkOKMiTktpwJTIGRmCGdaVICBZ6hA
suppl=w6hyCHL1$WIjv27xAalSxjRgjPKppI1ySZp86Q7zkMs
Type-System: sts:3pzOQ8jc-nE9lsSp-a51hPfv-xeYwyK0-evp1qcM-rR!COak#wedding-gong-mental
Check-SHA256: 25186fb00f21984f33ab242b5ec620df90dd34a7f8430372ab0254a8f7d33fe5
Check-SHA256: 38d5a4c3eefc5517d9a5b2f12ca4070150373b32c31e6d00529d9d0f0b0eba3f

0s;XEQb$5EH9}!?WdefyeA22rmXX)ZV_yI}MH~YN>;K=mRmV)&;+=Xmp=8%{dOaKyPp>`{W+ev&_Ht^T
vI2G1Jtsm#HCZ5u7Cwae0cHRI0000617UJ>0e1iJJu1QEX=%Xy>vn1>teUKtq)w3djjO=VIO}{ZUjP6H
Expand Down Expand Up @@ -44,9 +44,9 @@ Y<VDaaAjj@W@%+)AYpSLVIXI0Z(?C=AaG%FVQpn}WpW^7Z)J0CCv+ffVRU0?AarPDAZc@Rb!B8Ab9HcV
Y<VDIY;131VRU6=AarjabZBKDVRLh3bRchcZe?<F4{mR6MR9duY(Z^rb#8QXMRaIoAaiwXAa7<Mb8uyD
bRc1Kb7gdMAY^Z4b8aVeAZ2lNVQe6DZy<DNWgv5PZ6I%EAYpTJWpr~OX>K5Ib#!obbaONSb8~4rOj=Vh
b$BgjYD771SWreSPh(|tRaI+OEjDs9byGuAHZ5UMXmdGNHD)b1N<}w!000641=6B0dz(d+*sZj++->l;
t}Y?Say-NZ(5a@eh#oRVFOJz}00000GyrpRX*x_=Q!#aTEoW*(Ic```MlDZcWpq_lYga8cax-;PLsK>_
t}Y?Say-NZ(5a@eh#oRVp!4l!00000GyrpRX*x_=Q!#aTEoW*(Ic```MlDZcWpq_lYga8cax-;PLsK>_
VNqyvIaf7iEjUU=H+KO50RRFBMrC1ib#i5M3;+QNW^!R;bZKvHVQdIfbYX5}VRB>!00mM<LNYZ12?E^6
SR72ip~aLs|HH6%G0w``=7m2{56eq<e7t2rFOJz}00000GyrpRX*x_=Q!#aTEoW*(Ic```MlDZcWpq_l
SR72ip~aLs|HH6%G0w``=7m2{56eq<e7t2rp!4l!00000GyrpRX*x_=Q!#aTEoW*(Ic```MlDZcWpq_l
Yga8cax-;PLsK>_VNqyvIaf7iEjUU=H+KO50RRFBMrC1ib#i5M6#xPVVs&zEVPb4$3TAR)V{~b6ZeeT)
Q*>c&WMOh-1^@+8M?x|+C;$Ks(i%G%h4}Sf8vn;89aSG|t4s0*&BRFk%a^yrND0jb0t9t*cyH)xK+Rkw
`Mu(V|7oQWGN(Z+AyvH&RuaL#<Ajx9#Rdg%a&K>D^138|7M^`NNc{jXEg#>2x#JO!0is)`buE3*f$s=7
Expand Down
44 changes: 18 additions & 26 deletions src/rgb20/wrapper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.

use std::collections::HashMap;

use rgbstd::interface::{
AmountChange, ContractIface, FungibleAllocation, IfaceClass, IfaceId, IfaceOp, IfaceWrapper,
OutpointFilter, RightsAllocation,
AssignmentsFilter, ContractIface, ContractOp, FungibleAllocation, IfaceClass, IfaceId,
IfaceWrapper, RightsAllocation,
};
use rgbstd::invoice::{Amount, Precision};
use rgbstd::persistence::ContractStateRead;
use rgbstd::stl::{AssetSpec, ContractTerms, Details};
use rgbstd::{AssetTag, ContractId, SchemaId, XWitnessId};
use rgbstd::vm::WitnessOrd;
use rgbstd::{AssetTag, ContractId, SchemaId, WitnessInfo, XWitnessId};
use strict_encoding::InvalidRString;

use super::{Inflation, PrimaryIssue, Rgb20, Rgb20Info};
Expand Down Expand Up @@ -108,18 +105,14 @@ impl<S: ContractStateRead> IfaceWrapper<S> for Rgb20Wrapper<S> {
}

#[inline]
fn contract_id(&self) -> ContractId {
self.0.contract_id()
}
fn contract_id(&self) -> ContractId { self.0.contract_id() }

Check warning on line 108 in src/rgb20/wrapper.rs

View check run for this annotation

Codecov / codecov/patch

src/rgb20/wrapper.rs#L108

Added line #L108 was not covered by tests

#[inline]
fn schema_id(&self) -> SchemaId {
self.0.state.schema_id()
}
fn schema_id(&self) -> SchemaId { self.0.state.schema_id() }

Check warning on line 111 in src/rgb20/wrapper.rs

View check run for this annotation

Codecov / codecov/patch

src/rgb20/wrapper.rs#L111

Added line #L111 was not covered by tests

#[inline]
fn witness_info(&self, witness_id: XWitnessId) -> Option<WitnessOrd> {
self.0.state.witness_info(witness_id)
fn witness_info(&self, witness_id: XWitnessId) -> Option<WitnessInfo> {
self.0.witness_info(witness_id)
}

Check warning on line 116 in src/rgb20/wrapper.rs

View check run for this annotation

Codecov / codecov/patch

src/rgb20/wrapper.rs#L114-L116

Added lines #L114 - L116 were not covered by tests
}

Expand Down Expand Up @@ -199,15 +192,15 @@ impl<S: ContractStateRead> Rgb20Wrapper<S> {
AssetSpec::from_strict_val_unchecked(strict_val)
}

pub fn balance(&self, filter: impl OutpointFilter) -> Amount {
pub fn balance(&self, filter: impl AssignmentsFilter) -> Amount {

Check warning on line 195 in src/rgb20/wrapper.rs

View check run for this annotation

Codecov / codecov/patch

src/rgb20/wrapper.rs#L195

Added line #L195 was not covered by tests
self.allocations(filter)
.map(|alloc| alloc.state)
.sum::<Amount>()
}

pub fn allocations<'c>(
&'c self,
filter: impl OutpointFilter + 'c,
filter: impl AssignmentsFilter + 'c,

Check warning on line 203 in src/rgb20/wrapper.rs

View check run for this annotation

Codecov / codecov/patch

src/rgb20/wrapper.rs#L203

Added line #L203 was not covered by tests
) -> impl Iterator<Item = FungibleAllocation> + 'c {
self.0
.fungible("assetOwner", filter)
Expand All @@ -216,7 +209,7 @@ impl<S: ContractStateRead> Rgb20Wrapper<S> {

pub fn inflation_allowance_allocations<'c>(
&'c self,
filter: impl OutpointFilter + 'c,
filter: impl AssignmentsFilter + 'c,

Check warning on line 212 in src/rgb20/wrapper.rs

View check run for this annotation

Codecov / codecov/patch

src/rgb20/wrapper.rs#L212

Added line #L212 was not covered by tests
) -> impl Iterator<Item = FungibleAllocation> + 'c {
self.0
.fungible("inflationAllowance", filter)
Expand All @@ -225,7 +218,7 @@ impl<S: ContractStateRead> Rgb20Wrapper<S> {

pub fn update_right<'c>(
&'c self,
filter: impl OutpointFilter + 'c,
filter: impl AssignmentsFilter + 'c,

Check warning on line 221 in src/rgb20/wrapper.rs

View check run for this annotation

Codecov / codecov/patch

src/rgb20/wrapper.rs#L221

Added line #L221 was not covered by tests
) -> impl Iterator<Item = RightsAllocation> + 'c {
self.0
.rights("updateRight", filter)
Expand All @@ -234,7 +227,7 @@ impl<S: ContractStateRead> Rgb20Wrapper<S> {

pub fn burn_epoch<'c>(
&'c self,
filter: impl OutpointFilter + 'c,
filter: impl AssignmentsFilter + 'c,

Check warning on line 230 in src/rgb20/wrapper.rs

View check run for this annotation

Codecov / codecov/patch

src/rgb20/wrapper.rs#L230

Added line #L230 was not covered by tests
) -> impl Iterator<Item = RightsAllocation> + 'c {
self.0
.rights("burnEpoch", filter)
Expand All @@ -243,7 +236,7 @@ impl<S: ContractStateRead> Rgb20Wrapper<S> {

pub fn burn_right<'c>(
&'c self,
filter: impl OutpointFilter + 'c,
filter: impl AssignmentsFilter + 'c,

Check warning on line 239 in src/rgb20/wrapper.rs

View check run for this annotation

Codecov / codecov/patch

src/rgb20/wrapper.rs#L239

Added line #L239 was not covered by tests
) -> impl Iterator<Item = RightsAllocation> + 'c {
self.0
.rights("burnRight", filter)
Expand Down Expand Up @@ -302,12 +295,11 @@ impl<S: ContractStateRead> Rgb20Wrapper<S> {

pub fn total_supply(&self) -> Amount { self.total_issued_supply() - self.total_burned_supply() }

pub fn transfer_history(
pub fn history(

Check warning on line 298 in src/rgb20/wrapper.rs

View check run for this annotation

Codecov / codecov/patch

src/rgb20/wrapper.rs#L298

Added line #L298 was not covered by tests
&self,
outpoint_filter: impl OutpointFilter + Copy,
) -> HashMap<XWitnessId, IfaceOp<AmountChange>> {
self.0
.fungible_ops("assetOwner", outpoint_filter)
.expect("state name is not correct")
filter_outpoints: impl AssignmentsFilter + Clone,
filter_witnesses: impl AssignmentsFilter + Clone,
) -> Vec<ContractOp> {
self.0.history(filter_outpoints, filter_witnesses)

Check warning on line 303 in src/rgb20/wrapper.rs

View check run for this annotation

Codecov / codecov/patch

src/rgb20/wrapper.rs#L300-L303

Added lines #L300 - L303 were not covered by tests
}
}
27 changes: 15 additions & 12 deletions src/rgb21/wrapper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@
// limitations under the License.

use rgbstd::interface::{
ContractIface, DataAllocation, IfaceClass, IfaceId, IfaceWrapper, OutpointFilter,
AssignmentsFilter, ContractIface, ContractOp, DataAllocation, IfaceClass, IfaceId, IfaceWrapper,
};
use rgbstd::persistence::ContractStateRead;
use rgbstd::stl::{bp_tx_stl, rgb_contract_stl, AssetSpec, ContractTerms};
use rgbstd::{Allocation, ContractId, SchemaId, XWitnessId};
use rgbstd::vm::WitnessOrd;
use rgbstd::{Allocation, ContractId, SchemaId, WitnessInfo, XWitnessId};
use strict_types::stl::std_stl;
use strict_types::{CompileError, LibBuilder, TypeLib};

Expand Down Expand Up @@ -75,18 +74,14 @@ impl<S: ContractStateRead> IfaceWrapper<S> for Rgb21Wrapper<S> {
fn info(&self) -> Self::Info { todo!() }

#[inline]
fn contract_id(&self) -> ContractId {
self.0.contract_id()
}
fn contract_id(&self) -> ContractId { self.0.contract_id() }

Check warning on line 77 in src/rgb21/wrapper.rs

View check run for this annotation

Codecov / codecov/patch

src/rgb21/wrapper.rs#L77

Added line #L77 was not covered by tests

#[inline]
fn schema_id(&self) -> SchemaId {
self.0.state.schema_id()
}
fn schema_id(&self) -> SchemaId { self.0.state.schema_id() }

Check warning on line 80 in src/rgb21/wrapper.rs

View check run for this annotation

Codecov / codecov/patch

src/rgb21/wrapper.rs#L80

Added line #L80 was not covered by tests

#[inline]
fn witness_info(&self, witness_id: XWitnessId) -> Option<WitnessOrd> {
self.0.state.witness_info(witness_id)
fn witness_info(&self, witness_id: XWitnessId) -> Option<WitnessInfo> {
self.0.witness_info(witness_id)
}

Check warning on line 85 in src/rgb21/wrapper.rs

View check run for this annotation

Codecov / codecov/patch

src/rgb21/wrapper.rs#L83-L85

Added lines #L83 - L85 were not covered by tests
}

Expand Down Expand Up @@ -130,10 +125,18 @@ impl<S: ContractStateRead> Rgb21Wrapper<S> {

pub fn allocations<'c>(
&'c self,
filter: impl OutpointFilter + 'c,
filter: impl AssignmentsFilter + 'c,

Check warning on line 128 in src/rgb21/wrapper.rs

View check run for this annotation

Codecov / codecov/patch

src/rgb21/wrapper.rs#L128

Added line #L128 was not covered by tests
) -> impl Iterator<Item = DataAllocation> + 'c {
self.0
.data("assetOwner", filter)
.expect("RGB21 interface requires `assetOwner` state")
}

pub fn history(
&self,
filter_outpoints: impl AssignmentsFilter + Clone,
filter_witnesses: impl AssignmentsFilter + Clone,
) -> Vec<ContractOp> {
self.0.history(filter_outpoints, filter_witnesses)
}

Check warning on line 141 in src/rgb21/wrapper.rs

View check run for this annotation

Codecov / codecov/patch

src/rgb21/wrapper.rs#L135-L141

Added lines #L135 - L141 were not covered by tests
}
Loading

0 comments on commit 673e970

Please sign in to comment.