Skip to content

Commit

Permalink
update after rgb-core review
Browse files Browse the repository at this point in the history
  • Loading branch information
@zoedberg
zoedberg committed Jan 16, 2025
1 parent bc76d77 commit aa61b95
Show file tree
Hide file tree
Showing 23 changed files with 603 additions and 599 deletions.
2 changes: 1 addition & 1 deletion rgb-core
Submodule rgb-core updated 12 files
+3 −1 src/operation/commit.rs
+1 −13 src/operation/operations.rs
+3 −2 src/operation/xchain.rs
+2 −3 src/validation/status.rs
+4 −5 src/validation/validator.rs
+142 −141 stl/[email protected]
+ − stl/[email protected]
+9 −3 stl/[email protected]
+13 −13 stl/[email protected]
+ − stl/[email protected]
+7 −7 stl/[email protected]
+1 −0 stl/Transition.vesper
2 changes: 1 addition & 1 deletion rgb-std
Submodule rgb-std updated 16 files
+6 −6 asset/armored_contract.default
+6 −6 asset/armored_transfer.default
+ − asset/contract.default
+ − asset/transfer.default
+2 −0 src/containers/file.rs
+8 −7 src/interface/builder.rs
+2 −2 src/persistence/stash.rs
+2 −2 src/persistence/stock.rs
+2 −2 src/stl/stl.rs
+246 −245 stl/[email protected]
+ − stl/[email protected]
+61 −60 stl/[email protected]
+82 −82 stl/[email protected]
+ − stl/[email protected]
+71 −71 stl/[email protected]
+1 −0 stl/Transfer.vesper
129 changes: 71 additions & 58 deletions tests/fixtures/attack_bundles_pubWitness_data_input_sequence.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
version: v2
transfer: true
terminals:
c078eba839f58e10da6167fca6ce80d181b9ba8ac23b84b2b427cdd948cd6b93:
d60fbc4bfa14b26c1575506740867650f679ca13910d5ad5be22bfb3f2009da4:
chain: bitcoin
data: 2515a7207e7140f8ed30fd196646758ed35b511e70cbedd1c1301f3764aa690c
data: f6c58818656854cc09c3201f4ecb3b995817dec16cac94f3b3244326d0cdc361
genesis:
ffv: 0
schemaId: rgb:sch:RDYhMTR!9gv8Y2GLv9UNBEK1hcrCmdLDFk9Qd5fnO8k#brave-dinner-banana
flags: null
timestamp: 1733499679
timestamp: 1737042623
issuer: ssi:anonymous
layer1: bitcoin
testnet: true
closeMethod: opretFirst
assetTags:
4000: 8c119f88614d7fa87e49ada2927a2608b07761df2d02030f122ff3fb910c3815
4000: 625924a8313a2fd2a7772ed0ad025316fd9ef33e636ffebef1b6b3ed716154e6
metadata: {}
globals:
2000:
Expand All @@ -29,13 +30,13 @@ genesis:
- seal:
chain: bitcoin
data:
txid: 83e0138f6ff175ce48e5efd25bf798d90c16db3d0912369f6b91f90af7b7394c
vout: 1
blinding: 680128252376506157
txid: 5aa2d96e9eb52cb0da1ddc0fe5f4c19d6cae82b7c9cc501038bbf29fbee2b817
vout: 0
blinding: 8957930379714788528
state:
value: 666
blinding: 7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e
tag: 8c119f88614d7fa87e49ada2927a2608b07761df2d02030f122ff3fb910c3815
tag: 625924a8313a2fd2a7772ed0ad025316fd9ef33e636ffebef1b6b3ed716154e6
lock: null
valencies: []
validator: null
Expand All @@ -46,40 +47,40 @@ bundles:
data: !tx
version: 2
inputs:
- prevOutput: 83e0138f6ff175ce48e5efd25bf798d90c16db3d0912369f6b91f90af7b7394c:1
- prevOutput: 5aa2d96e9eb52cb0da1ddc0fe5f4c19d6cae82b7c9cc501038bbf29fbee2b817:0
sigScript: ''
sequence: 1
witness: []
outputs:
- value: 99999600
scriptPubkey: 00149e1fd260ec9559eab8ce06d577f9cb0118621ef1
scriptPubkey: 00148176f53030baa060021881c936191403a5132d3d
- value: 0
scriptPubkey: 6a206e706ba139b43649f5fa26fdecb9dcace09eefb3d05f91e1c8d282d489469d3e
scriptPubkey: 6a2003d129a0929a0da484a83e503d17207e32495be0d19abd51fae93a8b88bfd7f8
lockTime: 0
anchoredBundles: !opret
mpcProof:
pos: 6
pos: 7
cofactor: 0
path:
- 9b13f644994687763fbb6f2cfde8a5278ee292be06b22a2985e27ae308dde6f7
- f819239ad7ae4bcf9669be4075fc940a7048e0144bb5897c0947fa9dfa306082
- 3382a2912a870729f5b6db72fa68b0f2edab347c71d581583f5394db5fbad4b4
- e760769e0fd7ef516b564534aecf20a8c6ebc8af5b5565bfe85636dbc683b6c9
- ca7ad116f890ef167c293ae19e7212b9d393aa9fd03ce9388f3e7711e7396081
- 376fe7f0d6c1b55a57c0c361b46017be3b41a637183d62e763d4c3ef1eafa408
dbcProof: null
bundle:
closeMethod: opretFirst
inputMap:
0: cb10ae9aaeadfbd02605b5bb53ed4912ca35a299801eb056c4f5e27b47a33a27
0: 48d6d711fa9ebe4d080076b257029d8e9352379186c117ac6e71ee3a60bde458
knownTransitions:
cb10ae9aaeadfbd02605b5bb53ed4912ca35a299801eb056c4f5e27b47a33a27:
48d6d711fa9ebe4d080076b257029d8e9352379186c117ac6e71ee3a60bde458:
ffv: 0
contractId: rgb:ppleCoh3-Un2Awu2-Wh35f!I-6BOTNRg-MCOlGvu-vP!jCB4
contractId: rgb:jwqhtZYN-BqOwBEw-2750vWB-u$3kNor-A1WLQBU-WlQEop0
nonce: 18446744073709551615
transitionType: 65535
metadata: {}
globals: {}
inputs:
- prevOut:
op: a6995e0a8877527d80c2ed96877e5ff88e8139335180c08e946beebcffa3081e
op: 8f0aa1b5960d06a3b0044c36ef9d2f581bbfde4368ac0d562d00545a5404a29d
ty: 4000
no: 0
assignments:
Expand All @@ -91,42 +92,54 @@ bundles:
data:
txid: null
vout: 0
blinding: 3796279988688466614
blinding: 18109541497092664369
state:
value: 666
blinding: 7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e7e
tag: 8c119f88614d7fa87e49ada2927a2608b07761df2d02030f122ff3fb910c3815
tag: 625924a8313a2fd2a7772ed0ad025316fd9ef33e636ffebef1b6b3ed716154e6
lock: null
valencies: []
validator: null
witness: null
- pubWitness:
chain: bitcoin
data: !txid 6a3e8af0f6c16fd1bfbe28219bf79997e2f7383d640d9b6bfe2aedb5ec825ce2
data: !tx
version: 2
inputs:
- prevOutput: f18f5b7496dff031a4700cd0b62d451489c9c560271b0048cf77b3d4c01a11bf:0
sigScript: ''
sequence: 0
witness: []
outputs:
- value: 99998800
scriptPubkey: 0014f349a8d7a41f93b44c29a4c0c941d2cfce8a3d29
- value: 0
scriptPubkey: 6a207da96850cea30ae37832ef9fa42c27e67bb7746781dd39225972d7fab87a9949
lockTime: 0
anchoredBundles: !opret
mpcProof:
pos: 6
pos: 7
cofactor: 0
path:
- 4d1c5e7d32815befc3b9016f5683f3a029c3fb7f8ba9cbb53b1a321cc68abf41
- 554fb86c0a64b5848ecbc51d23609a4c6909b8178531bb77a368c6c911df16dc
- c8e3558f0ff196a83539a4f9842c72494b4bfcbf666bfd97ce0f91e7db74d1c9
- b50124d2728c4ead4ede4f04dd1baaec6434864c6503909c37f5ecec107575a9
- ccadfa40e23678426f49d7ab55531d38191f1ce850bf03abc14981fcbbdbff1d
- 0d876bcdedafcd894a4b5f0c4fabf788b1d48953c69127783e301b63f3d89f1e
dbcProof: null
bundle:
closeMethod: opretFirst
inputMap:
0: 0c8e7d4add9215ef352f6d8c7fa3261de3a436b326a4efce6b975d45f517b949
0: ed309a7f2f07fc132174c5023f5965b2e5482137047bf6b92e65b3bfa5713aa5
knownTransitions:
0c8e7d4add9215ef352f6d8c7fa3261de3a436b326a4efce6b975d45f517b949:
ed309a7f2f07fc132174c5023f5965b2e5482137047bf6b92e65b3bfa5713aa5:
ffv: 0
contractId: rgb:ppleCoh3-Un2Awu2-Wh35f!I-6BOTNRg-MCOlGvu-vP!jCB4
contractId: rgb:jwqhtZYN-BqOwBEw-2750vWB-u$3kNor-A1WLQBU-WlQEop0
nonce: 18446744073709551615
transitionType: 10000
metadata: {}
globals: {}
inputs:
- prevOut:
op: cb10ae9aaeadfbd02605b5bb53ed4912ca35a299801eb056c4f5e27b47a33a27
op: 545de13eedf816c1397881bd0e3a5daad4a978e52329f75d6bda73de9388fea5
ty: 4000
no: 0
assignments:
Expand All @@ -138,19 +151,19 @@ bundles:
data:
txid: null
vout: 0
blinding: 10674627297272414776
blinding: 2355376232384358743
state:
value: 616
blinding: dabecf020564288bd6f70dcb1b9234e1d8866cf4560a9b9c46f318b538a35260
tag: 8c119f88614d7fa87e49ada2927a2608b07761df2d02030f122ff3fb910c3815
value: 539
blinding: b76a2e82427d0fe0d4fd5e41a6ccadbe79974e4d5e612ee51d0e8f99962e9148
tag: 625924a8313a2fd2a7772ed0ad025316fd9ef33e636ffebef1b6b3ed716154e6
lock: null
- seal:
chain: bitcoin
data: 3bb76668c2f2d017eabd062288cfbee1d3f66cfafa28d8c78bd99c698bb9f8fc
data: f6c58818656854cc09c3201f4ecb3b995817dec16cac94f3b3244326d0cdc361
state:
value: 50
blinding: a3bfaf7c791a55f2a78770b362ec499b60a6ee70d7bc831df75dc45616116d5f
tag: 8c119f88614d7fa87e49ada2927a2608b07761df2d02030f122ff3fb910c3815
value: 77
blinding: 56db6eff0740ca506b96ecbda2403800141d63ccb8400399959b03fff0d2543d
tag: 625924a8313a2fd2a7772ed0ad025316fd9ef33e636ffebef1b6b3ed716154e6
lock: null
valencies: []
validator: null
Expand All @@ -160,40 +173,40 @@ bundles:
data: !tx
version: 2
inputs:
- prevOutput: 6a3e8af0f6c16fd1bfbe28219bf79997e2f7383d640d9b6bfe2aedb5ec825ce2:0
- prevOutput: 252b60eb081f7128b82d4bc3abcf39413c94b6a51d3b27bfb530424c05ed7d09:0
sigScript: ''
sequence: 0
witness: []
outputs:
- value: 99998800
scriptPubkey: 001435b3d4350a7cea447901a02a3bdc144f6da2f2b8
- value: 99999200
scriptPubkey: 001455d98771388ec14ffc5d58de9267eed55bbfcc02
- value: 0
scriptPubkey: 6a2038891282e63102e13b121ae0e5cad7cdffe274f65325e6989248b41baa77c266
scriptPubkey: 6a203bae1119b87eb25690b7fd213114b48a373e6491d79baa901ab155a96dfc1f5f
lockTime: 0
anchoredBundles: !opret
mpcProof:
pos: 6
pos: 7
cofactor: 0
path:
- 08f05e8b0c15aca1e7ba446a9d050f182f82adedb3d502f591c3f279b8dff455
- 86650bc8b5c8f3bc4e0b3b75b01688b2b38ccaf9b0c31c19893465d97b9a73f1
- 2ab029030ca0f33f614732ae3f0f5c72fa7ed722f7738e06fabd0e9010459fac
- 73b507b89d02c0380d7a07596bc81e1824a5e955f458f24ecb0f34c9f7c07069
- 0abb023877c33bc71395500499e0922bbf57290126d8cec073a55cc611123ab4
- 0c2233fee19ce875c5b0848b2a79ac15c8b820339d5200868c1df9ec29aa8329
dbcProof: null
bundle:
closeMethod: opretFirst
inputMap:
0: d0dd782cd14758e5d40d7f10e56f20163efc8b4f6aa773788a2c807870e436ba
0: 545de13eedf816c1397881bd0e3a5daad4a978e52329f75d6bda73de9388fea5
knownTransitions:
d0dd782cd14758e5d40d7f10e56f20163efc8b4f6aa773788a2c807870e436ba:
545de13eedf816c1397881bd0e3a5daad4a978e52329f75d6bda73de9388fea5:
ffv: 0
contractId: rgb:ppleCoh3-Un2Awu2-Wh35f!I-6BOTNRg-MCOlGvu-vP!jCB4
contractId: rgb:jwqhtZYN-BqOwBEw-2750vWB-u$3kNor-A1WLQBU-WlQEop0
nonce: 18446744073709551615
transitionType: 10000
metadata: {}
globals: {}
inputs:
- prevOut:
op: 0c8e7d4add9215ef352f6d8c7fa3261de3a436b326a4efce6b975d45f517b949
op: 48d6d711fa9ebe4d080076b257029d8e9352379186c117ac6e71ee3a60bde458
ty: 4000
no: 0
assignments:
Expand All @@ -205,19 +218,19 @@ bundles:
data:
txid: null
vout: 0
blinding: 12264113669691003871
blinding: 5417743796570256751
state:
value: 539
blinding: e56dbee53b96cda321dfdecd8a8b84585c7b66e346fb9c01eb489d4baa5c966e
tag: 8c119f88614d7fa87e49ada2927a2608b07761df2d02030f122ff3fb910c3815
value: 616
blinding: 0e459d8149bdda3140944aff490ce5bfd305d53367589242f2d7350cb6caa444
tag: 625924a8313a2fd2a7772ed0ad025316fd9ef33e636ffebef1b6b3ed716154e6
lock: null
- seal:
chain: bitcoin
data: 2515a7207e7140f8ed30fd196646758ed35b511e70cbedd1c1301f3764aa690c
data: 0897b0df904f72743ffd365518455b4e345c187e80c31412458494504e74c8bc
state:
value: 77
blinding: f551101cc9cd5ae8b5172efd9106b08836b9e2f7be579fd61b7cd9f65e7cfd33
tag: 8c119f88614d7fa87e49ada2927a2608b07761df2d02030f122ff3fb910c3815
value: 50
blinding: 7038e0fd34c0a44d3dea337f357198beab78a94b1725ec3b8ba74971c7b3da3a
tag: 625924a8313a2fd2a7772ed0ad025316fd9ef33e636ffebef1b6b3ed716154e6
lock: null
valencies: []
validator: null
Expand Down
Loading

0 comments on commit aa61b95

Please sign in to comment.