Skip to content

Commit 202cca3

Browse files
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # client_test.go
2 parents df0c531 + eaa4671 commit 202cca3

File tree

6 files changed

+391
-1
lines changed

6 files changed

+391
-1
lines changed

.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
main.go
22
go.sum
33
test-keyfile.json
4-
.DS_Store
4+
.DS_Store
5+
.idea
6+
vendor

LICENSE

+201
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

client.go

+90
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"github.com/tidwall/gjson"
1111
"gopkg.in/h2non/gentleman.v2"
1212
"io/ioutil"
13+
"math"
1314
"math/big"
1415
"net/http"
1516
"net/url"
@@ -1052,3 +1053,92 @@ func (c *Client) SubmitToWarp(tx *types.Transaction) ([]byte, error) {
10521053
defer resp.Body.Close()
10531054
return ioutil.ReadAll(resp.Body)
10541055
}
1056+
1057+
/**
1058+
1059+
bundleBinary Data Format
1060+
+------------------+-----------------------------+--------------------------------------------+
1061+
| Number of Items | Headers (64 bytes) | Items' Binary Data |
1062+
| 32 bytes | 32 bytes (length) + 32 bytes | |
1063+
| | (ID) for each item | |
1064+
+------------------+-----------------------------+--------------------------------------------+
1065+
*/
1066+
1067+
func (c *Client) GetBundleItems(bundleInId string, itemsIds []string) (items []*types.BundleItem, err error) {
1068+
offset, err := c.getTransactionOffset(bundleInId)
1069+
if err != nil {
1070+
return nil, err
1071+
}
1072+
1073+
size, err := strconv.ParseInt(offset.Size, 10, 64)
1074+
if err != nil {
1075+
return nil, err
1076+
}
1077+
endOffset, err := strconv.ParseInt(offset.Offset, 10, 64)
1078+
startOffset := endOffset - size + 1
1079+
1080+
firstChunk, err := c.getChunkData(startOffset)
1081+
if err != nil {
1082+
return nil, err
1083+
}
1084+
1085+
itemsNum := utils.ByteArrayToLong(firstChunk[:32])
1086+
1087+
// get Headers endOffset
1088+
bundleItemStart := 32 + itemsNum*64
1089+
var containHeadersChunks []byte
1090+
if len(firstChunk) < bundleItemStart {
1091+
// To calculate headers, you need to pull several chunks and fetch an integer upwards
1092+
chunkNum := int(math.Ceil(float64(bundleItemStart) / float64(types.MAX_CHUNK_SIZE)))
1093+
1094+
for i := 0; i < chunkNum; i++ {
1095+
chunk, err := c.getChunkData(startOffset + int64(i*types.MAX_CHUNK_SIZE))
1096+
if err != nil {
1097+
return nil, err
1098+
}
1099+
containHeadersChunks = append(containHeadersChunks, chunk...)
1100+
}
1101+
} else {
1102+
containHeadersChunks = firstChunk
1103+
}
1104+
1105+
for i := 0; i < itemsNum; i++ {
1106+
headerBegin := 32 + i*64
1107+
end := headerBegin + 64
1108+
1109+
headerByte := containHeadersChunks[headerBegin:end]
1110+
itemBinaryLength := utils.ByteArrayToLong(headerByte[:32])
1111+
id := utils.Base64Encode(headerByte[32:64])
1112+
1113+
// if item is in itemsIds
1114+
if utils.ContainsInSlice(itemsIds, id) {
1115+
1116+
startChunkNum := bundleItemStart / types.MAX_CHUNK_SIZE
1117+
startChunkOffset := bundleItemStart % types.MAX_CHUNK_SIZE
1118+
data := make([]byte, 0, itemBinaryLength)
1119+
1120+
for offset := startOffset + int64(startChunkNum*types.MAX_CHUNK_SIZE); offset <= startOffset+int64(bundleItemStart+itemBinaryLength); {
1121+
chunk, err := c.getChunkData(offset)
1122+
1123+
if err != nil {
1124+
return nil, err
1125+
}
1126+
data = append(data, chunk...)
1127+
offset += int64(len(chunk))
1128+
}
1129+
1130+
itemData := data[startChunkOffset : startChunkOffset+itemBinaryLength]
1131+
item, err := utils.DecodeBundleItem(itemData)
1132+
if err != nil {
1133+
return nil, err
1134+
}
1135+
1136+
items = append(items, item)
1137+
}
1138+
// next itemBy start offset
1139+
bundleItemStart += itemBinaryLength
1140+
}
1141+
1142+
return items, nil
1143+
1144+
}

client_test.go

+46
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,52 @@ func TestNewTempConn2(t *testing.T) {
351351
assert.NoError(t, err)
352352
}
353353

354+
// https://arweave.net/tx/x-q8ibbTfXIcdDXqQ3xaPD3PuShj832G_xzNT5QrVjY/offset
355+
// {"size":"753","offset":"146739359163367"}
356+
func Test_getChunkData(t *testing.T) {
357+
c := NewClient("https://arweave.net")
358+
data, err := c.getChunkData(146739359163367)
359+
assert.NoError(t, err)
360+
361+
t.Log(string(data))
362+
363+
}
364+
365+
func TestClient_GetBundleItems(t *testing.T) {
366+
c := NewClient("https://arweave.net")
367+
itemsIds := []string{"UCTEOaljmuutGJId-ktPY_q_Gbal8tyJuLfyR6BeaGw"}
368+
items, err := c.GetBundleItems("47KozLIAfVMKdxq1q3D1xFZmRpkahOOBQ8boOjSydnQ", itemsIds)
369+
assert.NoError(t, err)
370+
assert.Equal(t, 1, len(items))
371+
assert.Equal(t, "UCTEOaljmuutGJId-ktPY_q_Gbal8tyJuLfyR6BeaGw", items[0].Id)
372+
}
373+
374+
func TestClient_GetBundleItems2(t *testing.T) {
375+
c := NewClient("https://arweave.net")
376+
itemsIds := []string{"UCTEOaljmuutGJId-ktPY_q_Gbal8tyJuLfyR6BeaGw", "FCUfgEEPmZB3YQMTfbwYl6VA-JT54zLr5PrcJw2EFeM", "zlU0o99c81n0CP64F31ANpyJeOtlz5DKvsKohmbMxqU"}
377+
items, err := c.GetBundleItems("47KozLIAfVMKdxq1q3D1xFZmRpkahOOBQ8boOjSydnQ", itemsIds)
378+
379+
assert.NoError(t, err)
380+
assert.Equal(t, 3, len(items))
381+
assert.Equal(t, "UCTEOaljmuutGJId-ktPY_q_Gbal8tyJuLfyR6BeaGw", items[2].Id)
382+
assert.Equal(t, "FCUfgEEPmZB3YQMTfbwYl6VA-JT54zLr5PrcJw2EFeM", items[1].Id)
383+
assert.Equal(t, "zlU0o99c81n0CP64F31ANpyJeOtlz5DKvsKohmbMxqU", items[0].Id)
384+
}
385+
386+
// https://viewblock.io/zh-CN/arweave/tx/PRBVxEX00aVMN59EY8gznt83FTlGXZvESwv1WTP7ReQ 5000 items
387+
func TestClient_GetBundleItems3(t *testing.T) {
388+
c := NewClient("https://arweave.net")
389+
itemsIds := []string{"QD0ryQTy4CBr7kluWRLT1strRcXWJOgUUoIYat4lk1s", "BzsIVzo6rPfGQg0PP-5Y_HErPey51_it0d6aGIUfQnY", "fy3aOYoRf7OzCEd9_WrD-RfqbzNZ1LsJ4PKIIGUALik"}
390+
items, err := c.GetBundleItems("PRBVxEX00aVMN59EY8gznt83FTlGXZvESwv1WTP7ReQ", itemsIds)
391+
392+
assert.NoError(t, err)
393+
assert.Equal(t, 3, len(items))
394+
assert.Equal(t, "QD0ryQTy4CBr7kluWRLT1strRcXWJOgUUoIYat4lk1s", items[0].Id)
395+
assert.Equal(t, "fy3aOYoRf7OzCEd9_WrD-RfqbzNZ1LsJ4PKIIGUALik", items[1].Id)
396+
assert.Equal(t, "BzsIVzo6rPfGQg0PP-5Y_HErPey51_it0d6aGIUfQnY", items[2].Id)
397+
398+
}
399+
354400
func TestNewClient2(t *testing.T) {
355401
arTx := "b92IF6ZX0owPFcssPcs-qOBN2nuR0d3xLYOSovh1eck"
356402
c := NewClient("https://arweave.net")

utils/slice.go

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package utils
2+
3+
// ContainsInSlice checks if a string is in a slice of strings
4+
func ContainsInSlice(items []string, item string) bool {
5+
for _, eachItem := range items {
6+
if eachItem == item {
7+
return true
8+
}
9+
}
10+
return false
11+
}

0 commit comments

Comments
 (0)