Skip to content

Commit

Permalink
feat: bee 1.17.2 (#97)
Browse files Browse the repository at this point in the history 
* chore: add new bee files to gitignore

* feat: add new bee files to bee cleanup

* chore: add libp2p_v2 keys

* refactor: remove version format check

* test: change failed chunk retrieval status code
  • Loading branch information
@nugaon
nugaon committed Oct 3, 2023
1 parent f8e2319 commit 1fea708
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 7 deletions.
2 changes: 2 additions & 0 deletions generator/scripts/bee-cleanup.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ do
echo "$BEE_DIR"
rm -rf "$BEE_DIR/localstore"
rm -rf "$BEE_DIR/statestore"
rm -rf "$BEE_DIR/kademlia-metrics"
rm -rf "$BEE_DIR/stamperstore"
done

echo "Removing stopped Bee Docker containers..."
Expand Down
2 changes: 2 additions & 0 deletions generator/scripts/bee-data-dirs/fdp-play-queen/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
statestore
localstore
stamperstore
kademlia-metrics
1 change: 1 addition & 0 deletions generator/scripts/bee-data-dirs/fdp-play-queen/keys/libp2p_v2.key
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"address":"04e2d326bf5253d7fccefdfab26af5fe8f7835e16bf4cfe1e19fd56382dc57b3f5f6adb0df6ec77046a2f9dd35abdc5d8f94f8f51f2640476c90d68d621d0f311a","crypto":{"cipher":"aes-128-ctr","ciphertext":"ad666cfd7841108984720d2f1dadbba51d0606b8a25aae63fdd8985d12126980d46fcba2c3e7e97601b0208cf4e0cce67b730a8bc96a8a45f401d1f5590e684c67ac1d019e67cf31107d0fb6b3e63736fb773aa992dbc9beed26b2479eb42ef30aa40dff2b67b6001627341615513c7b7256f641c748007a05","cipherparams":{"iv":"c4d95b4b218593b8c2c8ff359d328fd4"},"kdf":"scrypt","kdfparams":{"n":32768,"r":8,"p":1,"dklen":32,"salt":"1bca95465b61eaa367c6841b6ebcee1172d01cc4abba341d577450294cf425f9"},"mac":"43c632557a1d463b5e68cfc78a9296dab7d4a3be3a70f15d39054fe152de9123"},"version":3,"id":"fa45aa8e-d6c3-440b-82d3-69f3ea387f67"}
2 changes: 2 additions & 0 deletions generator/scripts/bee-data-dirs/fdp-play-worker-1/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
statestore
localstore
stamperstore
kademlia-metrics
1 change: 1 addition & 0 deletions generator/scripts/bee-data-dirs/fdp-play-worker-1/keys/libp2p_v2.key
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"address":"04bff8a223ba80cbc384bf558afdf45b77bd655003a7a30e00407795faac38f7a3b784872bad3c9842999e5bcfa86fba4cf1f6ce725396cf824878b86335ff02c9","crypto":{"cipher":"aes-128-ctr","ciphertext":"759fd4447f7afbae2d17ad2916fe7ebc5e2fa7a29b28693998c5e5189535e91b89d9eca4213796b80a2f294ef4c421591582d4be8eee5944db90df754be05f1b3f7fa05662ed0d603392d6b86b50f6e94f368e63e643e3648eea2e1672b59fdc44e1a36b496da54f7e099536488cba60846e07979dbc525cc1","cipherparams":{"iv":"b7c51b1e7d8d9af8a0e72183bbb70b1b"},"kdf":"scrypt","kdfparams":{"n":32768,"r":8,"p":1,"dklen":32,"salt":"ac832a48c715f7e9b6e8797b2bbda6504bc005b4b37686f806b7b9e2d9327efd"},"mac":"e2b6a5de1a9ddd0159a59ac7299683309c263410b5ddcac13cb43bec734f46c0"},"version":3,"id":"33dd2d55-4c29-4004-82d5-f02aa1f8abf5"}
2 changes: 2 additions & 0 deletions generator/scripts/bee-data-dirs/fdp-play-worker-2/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
statestore
localstore
stamperstore
kademlia-metrics
1 change: 1 addition & 0 deletions generator/scripts/bee-data-dirs/fdp-play-worker-2/keys/libp2p_v2.key
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"address":"0475cf9bfdbee7d9ee53a0014592d8d1bd5aae48d42493bd9aa7b0818d76773bd1598566b3274b7237c43f306f672946f65dcf3fe92af6d0f8d845279f26d8faa1","crypto":{"cipher":"aes-128-ctr","ciphertext":"d1f139eabb2555dce6020c884bcf575c9f4379b3df9a61979a6d422dc46f0344c8576f965d39edb06c8c0436135669e6e4b573473cfb2628cd8643c6deec5e9ebf0435415cb22eb5101f50bdd2757a6dc01a8c9aa3a345a116bd08808240de03e0f2668c7274e247d0f13491ddc9496b83a53a36a4e68ba489","cipherparams":{"iv":"9e70d8851af9e2bed922bf62d556f38e"},"kdf":"scrypt","kdfparams":{"n":32768,"r":8,"p":1,"dklen":32,"salt":"3ce5acf729f04b9199bce8a916305899781162704c95537be1ffe43af2e46e77"},"mac":"412785444f2cb395573f696ce4c245960887cc430873a12c3628aba856bc0454"},"version":3,"id":"df6f3765-bd8e-4bf6-8cff-723b054e0c5e"}
2 changes: 2 additions & 0 deletions generator/scripts/bee-data-dirs/fdp-play-worker-3/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
statestore
localstore
stamperstore
kademlia-metrics
1 change: 1 addition & 0 deletions generator/scripts/bee-data-dirs/fdp-play-worker-3/keys/libp2p_v2.key
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"address":"0499ba538e4cb17c7131f84d994cff201466af61ff3d4e5a6ac6fe5691596a929c59a12e6ca4efb07675897f9205e89fc3aa1c70d57e4a102beb6374bd6600f5f2","crypto":{"cipher":"aes-128-ctr","ciphertext":"ba2b4cdd57cfea2eb104decbfbd1afe36dd5ca317f12c8940254c7aa6f0d0a05c122ebbe77cd302a84432f58499fe25951daccf54d4e4e2821ed3e539c4465420963186cfc5f02e22f1c58006c759531f366c27d065c66f40d70efa8ef4fa0109ac1578c3c9aabac8639a80a99f92dd1ddcbc6864ce0446b3e","cipherparams":{"iv":"c55c31f769e99d610c829a35a8b854c2"},"kdf":"scrypt","kdfparams":{"n":32768,"r":8,"p":1,"dklen":32,"salt":"6f14e64a15c451e9153b2efc8500f346648a12d85d3b284308bc0c02edcb3e93"},"mac":"709c749b788949699caa371434befadd704351f463bc57346b193be152ed5e98"},"version":3,"id":"e49c750e-437e-4197-9917-affa3cdf0af3"}
2 changes: 2 additions & 0 deletions generator/scripts/bee-data-dirs/fdp-play-worker-4/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
statestore
localstore
stamperstore
kademlia-metrics
1 change: 1 addition & 0 deletions generator/scripts/bee-data-dirs/fdp-play-worker-4/keys/libp2p_v2.key
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"address":"040751bfa32f1303ee72fc4721f04bb918c966fe880b62faff7197fea2469eab3ed484f2dbe36238e2c4ae844c084186a7f2ae15ccd0d5f1b3c10e43b9be99f79d","crypto":{"cipher":"aes-128-ctr","ciphertext":"f3c6b766e65ae2d8e3b5d11ef861073ba02c7126d36746d85c293ee56d9a44eb9d851cca75958f8978bf755ac8f23f6f98f2f4678de0cb0686aa5d9a76d5baefe435057e9e659ac09c6eb0265582bc9b571a1382325bc4e904b3f219c411ba6529dffb38fb19cb9122db8f068d1f6792bf0528872f41985209","cipherparams":{"iv":"716fc5142ae9cdbbfce29a120bdd0857"},"kdf":"scrypt","kdfparams":{"n":32768,"r":8,"p":1,"dklen":32,"salt":"7b6b923007495ec76b8a26d3b246f81a9065678a8e5893b4faeb7bd2b06b70bd"},"mac":"2530a320f45cd8edf061ccfe32659a8446b19188df2028004899a4be1e37c868"},"version":3,"id":"0fd6dc48-29f3-4854-ab02-35797f5650f0"}
6 changes: 0 additions & 6 deletions src/utils/config-sources.ts
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
const VERSION_REGEX = /^\d+\.\d+\.\d+(-\w+)*$/

export function stripCommit(version: string): string {
if (version === 'latest') {
return version
}

if (!VERSION_REGEX.test(version)) {
throw new Error('The version does not have expected format!')
}

// If the version contains commit ==> hash remove it
return version.replace('-stateful', '').replace(/-[0-9a-fA-F]{8}$/, '')
}
2 changes: 1 addition & 1 deletion test/integration/start.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ describe('start command', () => {
await run(['start', '--fresh', '--detach'])

console.log('(test) Trying to fetch the data')
await expect(bee.downloadData(reference)).rejects.toHaveProperty('status', 404)
await expect(bee.downloadData(reference)).rejects.toHaveProperty('status', 500)
}),
)
})
Expand Down

0 comments on commit 1fea708

Please sign in to comment.