From f6d85f06eb18327ea7d3f528105f5c60971aa070 Mon Sep 17 00:00:00 2001 From: Hitenjain14 <57557631+Hitenjain14@users.noreply.github.com> Date: Sun, 11 Feb 2024 01:19:44 +0530 Subject: [PATCH] add signature in header (#1378) * Update sprint 1.12 (#1341) * wait for repair and increase numBlocks (#1338) * reorder wait group done (#1340) --------- Co-authored-by: Ebrahim Gomaa * fix trailing whitespace (#1343) * Merge staging changes (#1346) * wait for repair and increase numBlocks (#1338) * reorder wait group done (#1340) * hotfix / remove hard coded prefix handling of encrypted upload (#1344) * remove hard coded prefix handling of encrypted upload * fix for other parts of the file --------- Co-authored-by: Hitenjain14 <57557631+Hitenjain14@users.noreply.github.com> Co-authored-by: Ebrahim Gomaa * fix upload select (#1351) * fix workdir in mobile sdk (#1345) * fix mobile workdir * set multi op batch size * set option to download to disk in wasm (#1348) * fix panic in hash chan (#1352) * Fix merge conflict in sprint-1.12 (#1354) * wait for repair and increase numBlocks (#1338) * reorder wait group done (#1340) * hotfix / remove hard coded prefix handling of encrypted upload (#1344) * remove hard coded prefix handling of encrypted upload * fix for other parts of the file * increase batch size (#1349) --------- Co-authored-by: Ebrahim Gomaa * repair in batches (#1347) * repair in batches * fix lint * fix unit test * fix batch size --------- Co-authored-by: Yury * Merge staging (#1365) * wait for repair and increase numBlocks (#1338) * reorder wait group done (#1340) * hotfix / remove hard coded prefix handling of encrypted upload (#1344) * remove hard coded prefix handling of encrypted upload * fix for other parts of the file * increase batch size (#1349) * Sprint changes (#1355) * Update sprint 1.12 (#1341) * wait for repair and increase numBlocks (#1338) * reorder wait group done (#1340) --------- Co-authored-by: Ebrahim Gomaa * fix trailing whitespace (#1343) * Merge staging changes (#1346) * wait for repair and increase numBlocks (#1338) * reorder wait group done (#1340) * hotfix / remove hard coded prefix handling of encrypted upload (#1344) * remove hard coded prefix handling of encrypted upload * fix for other parts of the file --------- Co-authored-by: Hitenjain14 <57557631+Hitenjain14@users.noreply.github.com> Co-authored-by: Ebrahim Gomaa * fix upload select (#1351) * fix workdir in mobile sdk (#1345) * fix mobile workdir * set multi op batch size * set option to download to disk in wasm (#1348) * fix panic in hash chan (#1352) * Fix merge conflict in sprint-1.12 (#1354) * wait for repair and increase numBlocks (#1338) * reorder wait group done (#1340) * hotfix / remove hard coded prefix handling of encrypted upload (#1344) * remove hard coded prefix handling of encrypted upload * fix for other parts of the file * increase batch size (#1349) --------- Co-authored-by: Ebrahim Gomaa * repair in batches (#1347) * repair in batches * fix lint * fix unit test * fix batch size --------- Co-authored-by: Yury --------- Co-authored-by: Ebrahim Gomaa Co-authored-by: peterlimg <54137706+peterlimg@users.noreply.github.com> Co-authored-by: Yury * fix repair after update (#1357) * fix err msg (#1361) * fix err msg * calc root hash once --------- Co-authored-by: Ebrahim Gomaa Co-authored-by: peterlimg <54137706+peterlimg@users.noreply.github.com> Co-authored-by: Yury * Fix stake pool stats (#1356) * wait for repair and increase numBlocks (#1338) * reorder wait group done (#1340) * hotfix / remove hard coded prefix handling of encrypted upload (#1344) * remove hard coded prefix handling of encrypted upload * fix for other parts of the file * increase batch size (#1349) * Sprint changes (#1355) * Update sprint 1.12 (#1341) * wait for repair and increase numBlocks (#1338) * reorder wait group done (#1340) --------- Co-authored-by: Ebrahim Gomaa * fix trailing whitespace (#1343) * Merge staging changes (#1346) * wait for repair and increase numBlocks (#1338) * reorder wait group done (#1340) * hotfix / remove hard coded prefix handling of encrypted upload (#1344) * remove hard coded prefix handling of encrypted upload * fix for other parts of the file --------- Co-authored-by: Hitenjain14 <57557631+Hitenjain14@users.noreply.github.com> Co-authored-by: Ebrahim Gomaa * fix upload select (#1351) * fix workdir in mobile sdk (#1345) * fix mobile workdir * set multi op batch size * set option to download to disk in wasm (#1348) * fix panic in hash chan (#1352) * Fix merge conflict in sprint-1.12 (#1354) * wait for repair and increase numBlocks (#1338) * reorder wait group done (#1340) * hotfix / remove hard coded prefix handling of encrypted upload (#1344) * remove hard coded prefix handling of encrypted upload * fix for other parts of the file * increase batch size (#1349) --------- Co-authored-by: Ebrahim Gomaa * repair in batches (#1347) * repair in batches * fix lint * fix unit test * fix batch size --------- Co-authored-by: Yury --------- Co-authored-by: Ebrahim Gomaa Co-authored-by: peterlimg <54137706+peterlimg@users.noreply.github.com> Co-authored-by: Yury * Fix stake pool stats --------- Co-authored-by: Hitenjain14 <57557631+Hitenjain14@users.noreply.github.com> Co-authored-by: Ebrahim Gomaa Co-authored-by: peterlimg <54137706+peterlimg@users.noreply.github.com> Co-authored-by: Yury * list pagination (#1368) * wait for repair and increase numBlocks (#1338) * reorder wait group done (#1340) * hotfix / remove hard coded prefix handling of encrypted upload (#1344) * remove hard coded prefix handling of encrypted upload * fix for other parts of the file * increase batch size (#1349) * add pagination in list --------- Co-authored-by: Ebrahim Gomaa * Fix sync in windows (#1370) * Add option for mimeType (#1372) * wait for repair and increase numBlocks (#1338) * reorder wait group done (#1340) * hotfix / remove hard coded prefix handling of encrypted upload (#1344) * remove hard coded prefix handling of encrypted upload * fix for other parts of the file * increase batch size (#1349) * add mimeType as option --------- Co-authored-by: Ebrahim Gomaa Co-authored-by: Yury * fix shutdown blobber (#1374) (cherry picked from commit 0fbb7023d93c1601970433089ceea0b0731ba280) * Cancel upload (#1332) * feature: added more test cases * fix: fixed existing test cases * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * feature: added more test cases * feature: added more test cases * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * feature: added mocks * fix: fixed bugs * fix: fixed mocks * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: made components internal * Add webstreaming to multiupload (#1190) * add webstreaming * fix typos * add webstreaming to wasm multiupload * fix typo * fix dup upload consensus (#1195) * Fix multiupload completed callback (#1172) * remove unnecessary print * fix delete and createdir * return major error * add webstreaming * fix typos * add webstreaming to wasm multiupload * fix typo * cleanup * fix completed callback * Feat/update methods in WinSDK (#1198) * delete dir in repair (#1196) * delete dir in repair * replace ioutil * fix unit test * fix list worker test * fix rename dir error * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * Add NFT Config contract (#1212) * Silent the zcnbridge http request when --silent (#1207) * Change the return type of downloadBlocks to []byte in wasm (#1218) * change the order of exchanges to get the ZCN prices (#1216) * Deprecate non multi-operation functions (#1214) * remove CreateDir, Rename, Copy, Move * use docker build wasm * use @v4 version of git action * Revert "use @v4 version of git action" This reverts commit fbb93f25a6ca63d6e205eac418d031bba428eb29. * Updated self hosted macos runner (#1219) * Updated self hosted macos runner * fixed runner name build-sdks.yml * remove path header, fix ws tag (#1220) * Feature/ Challenge based on rounds (#1191) * Fix * Fix * Fix * Fix * Fix * Debug * Debug * Debug * Fix * Heavy logging * Fix * More logging * Changed logging * Removed logging * Debug * Fix * Fix * Fix * expose send in wasm (#1225) * fix rename dir err (#1226) * Txnfee send (#1227) * add txnfee for send function * return txn verify output * add rename dir (#1230) * Async read (#1213) * basic timings for download * upload timings * to seconds * more timings for upload processing * display ms properly * cleanup * fix merge * fix merge * add more timing logs * fix dur to ms * add timings to read and build data * async read * range over errChan * fix unit test * rmv ctx cancel from multi upload * wait for last chunk * fix loop * rmv readChunk timing * increase buffer size * rmv timing logs * cleanup * updated go to version 1.20 * use -buildvcs=false --------- Co-authored-by: din-mukhammed Co-authored-by: Dinmukhammed Kambarov <52813950+din-mukhammed@users.noreply.github.com> Co-authored-by: shahnawaz-creator Co-authored-by: Manohar Reddy * Wasm for `move`, `rename`, `copy` (#1233) * add demo for move, rename and copy * remove debug logs --------- Co-authored-by: Yury * Feat/streaming server in winsdk (#1228) * fix move when srcPath is same as destPath (#1239) * fix(upload):fixed invalid ffmpeg command in transcode feature (#1236) * fix(upload):fixed invalid ffmpeg command in transcode feature * fix(upload): always delete transcode output file * fix(upload): fixed HideWindow issue * fix(upload): fixed HideWindow issue * fix(upload): fixed HideWindow issue * fix(upload): fixed HideWindow issue * fix(upload): fixed HideWindow issue * fix(upload): fixed HideWindow issue * fix(upload): fixed HideWindow issue * fix(devops): fixed build-windows * fix(mobilesdk): add logging for MultiUpload * fix(mobilesdk): fixed file permission issue on transcode * fixed lint error --------- Co-authored-by: dabasov * Fix web streaming - wasm (#1237) * Do not send GET http request with body * Use downloadBlocks to download in player_file * Call ListDir to get file meta * Format * Download 100 blocks each time by default * Fix downloadBlocks Track the downloaded bytes and trunk the padding 0 bytes * Update downloadBlocks to download blocks concurretly Use the same download method with downloadFileByBlocks * Add ActualFileSize in PlayListFile * Update wasm_exec.js to go 1.21.0 * Update version * Replace alloc.DownloadBlocks with DownloadBlocksToFileHandler * Add concurrency control (#1245) * control file ops concurrency * cleanup * add batch size to multi op * Fix/stream tests (#1247) * fix(upload): fixed file name issue in webstreaming * removed unused code * fix share consensus (#1246) * List optimization (#1240) * list optimization * list optimization * fix list hash * add to wg * fix list test * check consensus * fix listDir test * use once for mock calls * added sharders keep list (#1231) * added sharders keep list * added holder to zboxcore * removed duplicated sharder call * fixed lint * fixed panic * fixed panic * fixed panic * fixed panic * fixed panic * added consensus * added consensus * added consensus * refactored * refactored * refactored * chec alloc and prev alloc root (#1250) * add check for chunkNumber (#1253) * add check for chunkNumber * add err log * fix save progress * split-key handler implemented in wasm sdk * chnaging go version for cdn * bumped version * minor refactoring * bumping wasm_exec.js version * Refactoring unnecessary structs * create new conID (#1256) * debugging consoles added * fix statusbar update (#1257) * lint fixes * lint ignore * nolint: unused added * use httpdo for create connection (#1259) * Add create dir in repair (#1262) * fix delete dir err in cb * add way to create dir in repair * add desc for transaction data (#1263) * Feature: provide audit zcnswap and refactor if needed (#1205) * feature: modifies zcnswap to be consitent with zcnbridge * fix: fixed bugs * fix: removed dead code * feature: extended key store logic * fix: fixed bugs * fix: fixed conflicts * fix: removed dead code * fix: fixed bugs * Fix/remove path (#1221) * feature: added more test cases * fix: fixed existing test cases * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * feature: added more test cases * feature: added more test cases * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * feature: added mocks * fix: fixed bugs * fix: fixed mocks * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: made components internal * Add webstreaming to multiupload (#1190) * add webstreaming * fix typos * add webstreaming to wasm multiupload * fix typo * fix dup upload consensus (#1195) * Fix multiupload completed callback (#1172) * remove unnecessary print * fix delete and createdir * return major error * add webstreaming * fix typos * add webstreaming to wasm multiupload * fix typo * cleanup * fix completed callback * Feat/update methods in WinSDK (#1198) * delete dir in repair (#1196) * delete dir in repair * replace ioutil * fix unit test * fix list worker test * fix rename dir error * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * Add NFT Config contract (#1212) * Silent the zcnbridge http request when --silent (#1207) * Change the return type of downloadBlocks to []byte in wasm (#1218) * change the order of exchanges to get the ZCN prices (#1216) * Deprecate non multi-operation functions (#1214) * remove CreateDir, Rename, Copy, Move * use docker build wasm * use @v4 version of git action * Revert "use @v4 version of git action" This reverts commit fbb93f25a6ca63d6e205eac418d031bba428eb29. * Updated self hosted macos runner (#1219) * Updated self hosted macos runner * fixed runner name build-sdks.yml * remove path header, fix ws tag --------- Co-authored-by: YarikRevich Co-authored-by: Yaroslav Svitlytskyi <53532703+YarikRevich@users.noreply.github.com> Co-authored-by: Dinmukhammed Kambarov <52813950+din-mukhammed@users.noreply.github.com> Co-authored-by: Hitenjain14 <57557631+Hitenjain14@users.noreply.github.com> Co-authored-by: Lz Co-authored-by: Yaroslav Svitlytskyi Co-authored-by: peterlimg <54137706+peterlimg@users.noreply.github.com> Co-authored-by: Kishan Dhakan <42718091+Kishan-Dhakan@users.noreply.github.com> Co-authored-by: Manohar Reddy Co-authored-by: shahnawaz-creator <117025384+shahnawaz-creator@users.noreply.github.com> Co-authored-by: din-mukhammed * Revert "Fix/remove path (#1221)" (#1222) This reverts commit 464260aa3c2be34fdc0aca58582b27247528333b. * remove path header, fix ws tag (#1223) * remove path header, fix ws tag * fixed broken build --------- Co-authored-by: din-mukhammed * Updated self hosted macos runner (#1219) * Updated self hosted macos runner * fixed runner name build-sdks.yml (cherry picked from commit 1c9f143fe842e6c88fec1a6bc5fa0ced2ca84682) * fix * updated wasm binary build fix. * feature: added test case for swap logic * fix: resolved dependency conflicts * fix: fixed bugs * feature: added zcn eth rate fetch logic * Update blobber.go * Update authorizers_query.go * feature: replaced confusing param naming * fix: updated bridge initialization in wasm bridge integration * fix: replaced value amount with correct value * fix: wrong test case values * feature: switch to the usage of zcn token smart contract * fix: fixed bridge tests --------- Co-authored-by: Yaroslav Svitlytskyi Co-authored-by: Yury Co-authored-by: Dinmukhammed Kambarov <52813950+din-mukhammed@users.noreply.github.com> Co-authored-by: Hitenjain14 <57557631+Hitenjain14@users.noreply.github.com> Co-authored-by: Lz Co-authored-by: peterlimg <54137706+peterlimg@users.noreply.github.com> Co-authored-by: Kishan Dhakan <42718091+Kishan-Dhakan@users.noreply.github.com> Co-authored-by: Manohar Reddy Co-authored-by: shahnawaz-creator <117025384+shahnawaz-creator@users.noreply.github.com> Co-authored-by: din-mukhammed Co-authored-by: shahnawaz-creator * Feat/exposed cli methods in winsdk (#1248) * feat(winsdk): added CreateWallet * feat(winsdk): added RecoverWallet * feat(winsdk): added logging in CreateWallet and RecoverWallet * feat(winsdk): split InitSDK into InitZCNSDK and InitWallets * feat(winsdk): fixed zboxApiClient initialization issue * feat(winsdk): renamed init sdks * feat(winsdk): fixed init zboxApiClient issue * fix(winsdk): fixed RecoverWallet naming * fix(winsdk): fixed file name issue in GetUploadStatus for transcode feature * feat(winsdk): added GetFileContentType in winsdk * feat(winsdk): added ListAllocations * feat(winsdk): added CreateFreeAllocation * feat(winsdk): added allocation methods * fix(winsdk): added logs * feat(zboxapi): added GetFreeStorage * feat(zboxapi): also send X-App-ID-Token in header * fix(winsdk): skip TestGetFreeStorage * fix(winsdk): added getAllocationWith * fix(zboxapi): used local signHash instead of sys.SignFunc * fix(zboxapi): fixed token issue in GetFreeStorage * fix(list): exported ThumbnailHash and ThumbnailSize in ListResult * fix(0box): fixed GetFreeStorage/CreateFreeAllocation * fix(winsdk): renamed jwtToken with token in CreateFreeAllocation * fix(winsdk): renamed jwtToken with token in CreateFreeAllocation * feat(winsdk): added GetFreeMarker * feat(winsdk): added AddSharedInfo/DeleteSharedInfo/GetSharedToMe/GetSharedByMe * feat(winsdk): added CreateAuthTicket/DeleteAuthTicket * feat(winsdk): fixed GetSharedToMe/GetSharedByMe * feat(winsdk): fixed GetSharedToMe/GetSharedByMe * feat(winsdk): exported CreateAuthTicket/DeleteAuthTicket/CreateSharedInfo/DeleteSharedInfo/GetSharedByMe/GetSharedByPublic/GetSharedToMe * Fix/fail shardedr on bad code (#1264) * Fix/remove path (#1221) * feature: added more test cases * fix: fixed existing test cases * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * feature: added more test cases * feature: added more test cases * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * feature: added mocks * fix: fixed bugs * fix: fixed mocks * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: made components internal * Add webstreaming to multiupload (#1190) * add webstreaming * fix typos * add webstreaming to wasm multiupload * fix typo * fix dup upload consensus (#1195) * Fix multiupload completed callback (#1172) * remove unnecessary print * fix delete and createdir * return major error * add webstreaming * fix typos * add webstreaming to wasm multiupload * fix typo * cleanup * fix completed callback * Feat/update methods in WinSDK (#1198) * delete dir in repair (#1196) * delete dir in repair * replace ioutil * fix unit test * fix list worker test * fix rename dir error * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * Add NFT Config contract (#1212) * Silent the zcnbridge http request when --silent (#1207) * Change the return type of downloadBlocks to []byte in wasm (#1218) * change the order of exchanges to get the ZCN prices (#1216) * Deprecate non multi-operation functions (#1214) * remove CreateDir, Rename, Copy, Move * use docker build wasm * use @v4 version of git action * Revert "use @v4 version of git action" This reverts commit fbb93f25a6ca63d6e205eac418d031bba428eb29. * Updated self hosted macos runner (#1219) * Updated self hosted macos runner * fixed runner name build-sdks.yml * remove path header, fix ws tag --------- Co-authored-by: YarikRevich Co-authored-by: Yaroslav Svitlytskyi <53532703+YarikRevich@users.noreply.github.com> Co-authored-by: Dinmukhammed Kambarov <52813950+din-mukhammed@users.noreply.github.com> Co-authored-by: Hitenjain14 <57557631+Hitenjain14@users.noreply.github.com> Co-authored-by: Lz Co-authored-by: Yaroslav Svitlytskyi Co-authored-by: peterlimg <54137706+peterlimg@users.noreply.github.com> Co-authored-by: Kishan Dhakan <42718091+Kishan-Dhakan@users.noreply.github.com> Co-authored-by: Manohar Reddy Co-authored-by: shahnawaz-creator <117025384+shahnawaz-creator@users.noreply.github.com> Co-authored-by: din-mukhammed * Revert "Fix/remove path (#1221)" (#1222) This reverts commit 464260aa3c2be34fdc0aca58582b27247528333b. * remove path header, fix ws tag (#1223) * remove path header, fix ws tag * fixed broken build --------- Co-authored-by: din-mukhammed * Updated self hosted macos runner (#1219) * Updated self hosted macos runner * fixed runner name build-sdks.yml (cherry picked from commit 1c9f143fe842e6c88fec1a6bc5fa0ced2ca84682) * updated wasm binary build fix. * README grammar and formatting tweaks. * Merge remote-tracking branch 'origin/feature/sharder-keep-list' into feature/sharder-keep-list --------- Co-authored-by: YarikRevich Co-authored-by: Yaroslav Svitlytskyi <53532703+YarikRevich@users.noreply.github.com> Co-authored-by: Dinmukhammed Kambarov <52813950+din-mukhammed@users.noreply.github.com> Co-authored-by: Hitenjain14 <57557631+Hitenjain14@users.noreply.github.com> Co-authored-by: Lz Co-authored-by: Yaroslav Svitlytskyi Co-authored-by: peterlimg <54137706+peterlimg@users.noreply.github.com> Co-authored-by: Kishan Dhakan <42718091+Kishan-Dhakan@users.noreply.github.com> Co-authored-by: Manohar Reddy Co-authored-by: shahnawaz-creator <117025384+shahnawaz-creator@users.noreply.github.com> Co-authored-by: din-mukhammed Co-authored-by: shahnawaz-creator Co-authored-by: UncertainBadg3r <139782199+UncertainBadg3r@users.noreply.github.com> * Fix/roll logs (#1266) * Added lumberjack logger * Added lumberjack logger * fix:download file/thumbnail by authticket in winsdk (#1265) * feat(winsdk): added GetWalletBalance (#1267) * enabled gosdk update for sprint branches (#1268) * Revert "enabled gosdk update for sprint branches (#1268)" (#1269) This reverts commit 201b8bdc4f94b2aeb5eda3ce16f91b4327023654. * fix in progress callback (#1270) * Cleanup update terms from update allocation (#1274) * Improve download performance (#1271) * improve download performance * add read buffer size * add hash option * fix lint test * set default to true * log for data * fix read * feature: add reset nonce for bridge (#1279) * Add registerAuthorizer to wasm (#1275) * Hotfix/parse hostname error (#1241) * Fix/remove path (#1221) * feature: added more test cases * fix: fixed existing test cases * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * feature: added more test cases * feature: added more test cases * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * feature: added mocks * fix: fixed bugs * fix: fixed mocks * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: made components internal * Add webstreaming to multiupload (#1190) * add webstreaming * fix typos * add webstreaming to wasm multiupload * fix typo * fix dup upload consensus (#1195) * Fix multiupload completed callback (#1172) * remove unnecessary print * fix delete and createdir * return major error * add webstreaming * fix typos * add webstreaming to wasm multiupload * fix typo * cleanup * fix completed callback * Feat/update methods in WinSDK (#1198) * delete dir in repair (#1196) * delete dir in repair * replace ioutil * fix unit test * fix list worker test * fix rename dir error * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * Add NFT Config contract (#1212) * Silent the zcnbridge http request when --silent (#1207) * Change the return type of downloadBlocks to []byte in wasm (#1218) * change the order of exchanges to get the ZCN prices (#1216) * Deprecate non multi-operation functions (#1214) * remove CreateDir, Rename, Copy, Move * use docker build wasm * use @v4 version of git action * Revert "use @v4 version of git action" This reverts commit fbb93f25a6ca63d6e205eac418d031bba428eb29. * Updated self hosted macos runner (#1219) * Updated self hosted macos runner * fixed runner name build-sdks.yml * remove path header, fix ws tag --------- Co-authored-by: YarikRevich Co-authored-by: Yaroslav Svitlytskyi <53532703+YarikRevich@users.noreply.github.com> Co-authored-by: Dinmukhammed Kambarov <52813950+din-mukhammed@users.noreply.github.com> Co-authored-by: Hitenjain14 <57557631+Hitenjain14@users.noreply.github.com> Co-authored-by: Lz Co-authored-by: Yaroslav Svitlytskyi Co-authored-by: peterlimg <54137706+peterlimg@users.noreply.github.com> Co-authored-by: Kishan Dhakan <42718091+Kishan-Dhakan@users.noreply.github.com> Co-authored-by: Manohar Reddy Co-authored-by: shahnawaz-creator <117025384+shahnawaz-creator@users.noreply.github.com> Co-authored-by: din-mukhammed * Revert "Fix/remove path (#1221)" (#1222) This reverts commit 464260aa3c2be34fdc0aca58582b27247528333b. * remove path header, fix ws tag * remove path header, fix ws tag (#1223) * remove path header, fix ws tag * fixed broken build --------- Co-authored-by: din-mukhammed * Updated self hosted macos runner (#1219) * Updated self hosted macos runner * fixed runner name build-sdks.yml (cherry picked from commit 1c9f143fe842e6c88fec1a6bc5fa0ced2ca84682) * added logging * updated wasm binary build fix. * updated wasm binary build fix. (cherry picked from commit 257188873db1d21ccdb04eb7e5a35ff6ef6d7696) * README grammar and formatting tweaks. --------- Co-authored-by: YarikRevich Co-authored-by: Yaroslav Svitlytskyi <53532703+YarikRevich@users.noreply.github.com> Co-authored-by: Dinmukhammed Kambarov <52813950+din-mukhammed@users.noreply.github.com> Co-authored-by: Hitenjain14 <57557631+Hitenjain14@users.noreply.github.com> Co-authored-by: Lz Co-authored-by: Yaroslav Svitlytskyi Co-authored-by: peterlimg <54137706+peterlimg@users.noreply.github.com> Co-authored-by: Kishan Dhakan <42718091+Kishan-Dhakan@users.noreply.github.com> Co-authored-by: Manohar Reddy Co-authored-by: shahnawaz-creator <117025384+shahnawaz-creator@users.noreply.github.com> Co-authored-by: din-mukhammed Co-authored-by: shahnawaz-creator Co-authored-by: UncertainBadg3r <139782199+UncertainBadg3r@users.noreply.github.com> Co-authored-by: Jayash Satolia <73050737+Jayashsatolia403@users.noreply.github.com> * Adding RegisterAuthorizer method in wasmsdk (#1273) * Adding RegisterAuthorizer method in wasmsdk * Fix:wasm test fail * Adding demo for RegisterAuthorizer handler in wasm * Js and Go bridge implementation * RegisterAuthorizer handler changes and adding Async Js bridge * golangci-lint fixes * Added error handling in setSplitKey and setAuthURL * Refactoring wasm exposed handlers * Setting split key wallet before setting auth url in setAuthURL's demo * Lint Fixes after resolving conflicts * upload optimization (#1281) * add sha256 simd and blake3 * add hash chan * fix lint and unit test * fix MHash * rmv timing log * fix thumbnail hash * added logging * added logging * hotfix * hotfix * experiment * experiment * experiment * experiment * experiment * experiment * experiment * experiment * experiment * experiment * experiment * Sprint 1.11 revert (#1284) * Revert "experiment" This reverts commit 050270f52815dcd930f760f20a4c7e3e669d73fb. * Revert "experiment" This reverts commit d4821f8e28c4efce59775129b4f25eaa1df2905d. * Revert "experiment" This reverts commit 9f65b2eef30528662b59482a6c59d6a633f1ff77. * Revert "experiment" This reverts commit 6313cb8a49d211ab8a6c476ca839922be7c31288. * Revert "experiment" This reverts commit b6be0b51767f39cb53a9439c3a34fe2f828b2dfc. * Revert "experiment" This reverts commit 68d41905a3aaf1c094d50f7b418349d7c78663cc. * Revert "experiment" This reverts commit 3a23f3f33b9446cf5711f950b0cd80a40993e429. * Revert "experiment" This reverts commit 6b6578bb857c9e4351db941fc84e65fac0994c15. * Revert "experiment" This reverts commit 65a0152adc10754977a479e09cdb8d577ca8aefb. * Revert "experiment" This reverts commit 6834b058a99bba80621c756292f7f4205b24e936. * Revert "experiment" This reverts commit 8446894c579f5acd14db1b09b5966f92ca1588be. * Revert "hotfix" This reverts commit 48cf793a70f754f44c662d839bdde4e191ec2748. * Revert "hotfix" This reverts commit 895c7f0012837d2f9a0cbfdcddf47f8dbe0d13b7. * Revert "added logging" This reverts commit fafce3c9b90c0863e574a2609a202f962ecb90ac. * Revert "added logging" This reverts commit 10b6a4afbdecc1e8a201d5ac80c4d12f0b97c411. * rmv channel hasher (#1285) * Fix submit txn (#1287) * Feature: add BNT, USDC and EURC tokens for Swap (#1277) * feature: add multiple token support for swap * feature: add correct Bancor API calls * feature: added approve for swap of bancor token * fix: removed debug lines * fix: fixed swap approval * fix: fixed bug * fix: fixed bugs * change hasher (#1288) * change hasher * set max proc to 1 * set batch size to 2 * revert hasher lib changes * increase batch size to 4 * set batch size to 2 * fix build * update chunk reader * run gc * add sleep and decrease batch size * change blake3 * fix operation slice * fix batch size * increase sleep time * add memory pool * increase swg for wasm * reuse chunk reader * fix read chunk * rmv unused package * Remove sleep and GOMAXPROCS=1 * Increase batch size a little --------- Co-authored-by: peterlimg * Import eth wallet with index (#1292) * Add import account address index * Make it optional * Feat/import-account-idx (#1294) * Add import account address index * Make it optional * Add account index option * Add account bip32 option (#1295) * Fix allocation min lock (#1297) * create PRs to dependent repos when a PR is merged to sprint branches (#1283) * create PRs to dependent repos when a PR is merged to sprint branches * add branch name * move wasm-build to build-sdk.yml * cleanup sdk-release.yml * Removed padding from the CryptoJS Encrypt and Decrypt functions functions. (#1300) Co-authored-by: Manohar Reddy * Fix allocation min lock * change chunkNumber for wasm (#1304) * change numBlock for wasm * change numBlocks * revert sdk changes * Feature: implement fork per run strategy (#1299) * feature: added fork creation * fix: fixed bug * feature: improved Tenderly fork creation flow * fix parse error (#1309) * fix parse error * fix log * add swg * Fix memory usage (#1311) * fix memory usage * change hasher to sha2 256 * fix unit test * increase numBlocks * fix thumbnail hash * Fix iso header (#1314) * add ISO check * remove filename field from authticket * fix typo * log auth token * cleanup * Fix zboxcore min submit (#1315) * Fix zboxcore min submit * Fix min submit and min confirmation default configs * Fix unit tests * Fix unit tests * Revert "Fix iso header (#1314)" (#1317) This reverts commit 218d3edd1a43dce1cfd1a700adcb33fb03a883f9. * Add upload for empty file (#1316) * add upload for empty file * fix hash * check ref * fix actual size * fix empty upload (#1320) * fix read auth ticket (#1319) * allocation validation for data parity shards (#1321) * fix git action to raise PRs to update gosdk (#1313) * test gosdk update * test-gosdk-update * use binary operators instead of terinary * use github.ref * use github ref * add branch name * use quotes * prepare for PR * test work flow dispatch * test extract branch * print env * prepare for PR * feature: added custom block number during Tenderly fork creation (#1323) * Fix/retry tx on nonce error (#1322) * Revert "experiment" This reverts commit 050270f52815dcd930f760f20a4c7e3e669d73fb. * Revert "experiment" This reverts commit d4821f8e28c4efce59775129b4f25eaa1df2905d. * Revert "experiment" This reverts commit 9f65b2eef30528662b59482a6c59d6a633f1ff77. * Revert "experiment" This reverts commit 6313cb8a49d211ab8a6c476ca839922be7c31288. * Revert "experiment" This reverts commit b6be0b51767f39cb53a9439c3a34fe2f828b2dfc. * Revert "experiment" This reverts commit 68d41905a3aaf1c094d50f7b418349d7c78663cc. * Revert "experiment" This reverts commit 3a23f3f33b9446cf5711f950b0cd80a40993e429. * Revert "experiment" This reverts commit 6b6578bb857c9e4351db941fc84e65fac0994c15. * Revert "experiment" This reverts commit 65a0152adc10754977a479e09cdb8d577ca8aefb. * Revert "experiment" This reverts commit 6834b058a99bba80621c756292f7f4205b24e936. * Revert "experiment" This reverts commit 8446894c579f5acd14db1b09b5966f92ca1588be. * Revert "hotfix" This reverts commit 48cf793a70f754f44c662d839bdde4e191ec2748. * Revert "hotfix" This reverts commit 895c7f0012837d2f9a0cbfdcddf47f8dbe0d13b7. * Revert "added logging" This reverts commit fafce3c9b90c0863e574a2609a202f962ecb90ac. * Revert "added logging" This reverts commit 10b6a4afbdecc1e8a201d5ac80c4d12f0b97c411. * retry failed transaction in zbox with nonce error * Fix wm rollback (#1324) * fix wm rollback * fix rb check * version logs * fix prev version * cleanup * Cleanup free storage update allocation (#1325) * remove batch size (#1327) * fix retry op callback (#1329) * Revert "remove batch size (#1327)" (#1328) This reverts commit 310edbb4d669566acc8cfc6e2940170d2da813fa. * fix cancel upload * Add `force` param for getAllocationBlobbers wasm (#1330) * fix retry callback (#1331) * Fix fill panic (#1334) * fix fill shards panic * add log for fill err * fix err * add cancel upload to wasm * fix proxy * wait for repair and increase numBlocks (#1338) * reorder wait group done (#1340) * hotfix / remove hard coded prefix handling of encrypted upload (#1344) * remove hard coded prefix handling of encrypted upload * fix for other parts of the file * increase batch size (#1349) * Sprint changes (#1355) * Update sprint 1.12 (#1341) * wait for repair and increase numBlocks (#1338) * reorder wait group done (#1340) --------- Co-authored-by: Ebrahim Gomaa * fix trailing whitespace (#1343) * Merge staging changes (#1346) * wait for repair and increase numBlocks (#1338) * reorder wait group done (#1340) * hotfix / remove hard coded prefix handling of encrypted upload (#1344) * remove hard coded prefix handling of encrypted upload * fix for other parts of the file --------- Co-authored-by: Hitenjain14 <57557631+Hitenjain14@users.noreply.github.com> Co-authored-by: Ebrahim Gomaa * fix upload select (#1351) * fix workdir in mobile sdk (#1345) * fix mobile workdir * set multi op batch size * set option to download to disk in wasm (#1348) * fix panic in hash chan (#1352) * Fix merge conflict in sprint-1.12 (#1354) * wait for repair and increase numBlocks (#1338) * reorder wait group done (#1340) * hotfix / remove hard coded prefix handling of encrypted upload (#1344) * remove hard coded prefix handling of encrypted upload * fix for other parts of the file * increase batch size (#1349) --------- Co-authored-by: Ebrahim Gomaa * repair in batches (#1347) * repair in batches * fix lint * fix unit test * fix batch size --------- Co-authored-by: Yury --------- Co-authored-by: Ebrahim Gomaa Co-authored-by: peterlimg <54137706+peterlimg@users.noreply.github.com> Co-authored-by: Yury * fix repair after update (#1357) * use mo ctx as parent * fix wasm build * empty commit * fix ctx --------- Co-authored-by: YarikRevich Co-authored-by: Yaroslav Svitlytskyi <53532703+YarikRevich@users.noreply.github.com> Co-authored-by: Dinmukhammed Kambarov <52813950+din-mukhammed@users.noreply.github.com> Co-authored-by: Lz Co-authored-by: Yaroslav Svitlytskyi Co-authored-by: peterlimg <54137706+peterlimg@users.noreply.github.com> Co-authored-by: Kishan Dhakan <42718091+Kishan-Dhakan@users.noreply.github.com> Co-authored-by: Manohar Reddy Co-authored-by: shahnawaz-creator <117025384+shahnawaz-creator@users.noreply.github.com> Co-authored-by: Jayash Satolia <73050737+Jayashsatolia403@users.noreply.github.com> Co-authored-by: din-mukhammed Co-authored-by: shahnawaz-creator Co-authored-by: Yury Co-authored-by: Ash-KODES Co-authored-by: Yaroslav Svitlytskyi Co-authored-by: UncertainBadg3r <139782199+UncertainBadg3r@users.noreply.github.com> Co-authored-by: peterlimg Co-authored-by: Tanishq Gupta <52757132+tanishq67@users.noreply.github.com> Co-authored-by: Jayash Satolia Co-authored-by: GuruHubb Co-authored-by: Ebrahim Gomaa * Fix auth response on wasm (#1359) * Fix auth response on wasm * Fix verifyHandler * Fix auth sign wasm * Update pkg for gomobile * Remove test code * fixed lint --------- Co-authored-by: dabasov * Download buffer (#1363) * revert index changes * revert close changes * rmv data buffer * download buffer * fix write to file * rmv len check * fix decodeEC ut * fix remaining size * cleanup * fix mem chan file * add signature in header * fix lint * add url in sig hash * fix hashData * check verify in v2 * fix req complete cb (#1381) * get hardfork round by name (#1385) * get hardfork round by name * fix naming * fix default hardfork round * made GetFreeAllocationBlobbers public * fixed resp format * fixed resp format * [wasm] Expose minersc - stakePool/unstakePool collect rewards (#1386) * replaced coingecko url with internal price url (#1379) * Add miner/sharder stake and unstake support * Add collect rewards for miner/sharder --------- Co-authored-by: Gaurang Patel * add v2 for sig --------- Co-authored-by: Ebrahim Gomaa Co-authored-by: peterlimg <54137706+peterlimg@users.noreply.github.com> Co-authored-by: Yury Co-authored-by: Jayash Satolia <73050737+Jayashsatolia403@users.noreply.github.com> Co-authored-by: Roshan Kumar <56060325+Roshan-Mehta@users.noreply.github.com> Co-authored-by: Manohar Reddy Co-authored-by: YarikRevich Co-authored-by: Yaroslav Svitlytskyi <53532703+YarikRevich@users.noreply.github.com> Co-authored-by: Dinmukhammed Kambarov <52813950+din-mukhammed@users.noreply.github.com> Co-authored-by: Lz Co-authored-by: Yaroslav Svitlytskyi Co-authored-by: Kishan Dhakan <42718091+Kishan-Dhakan@users.noreply.github.com> Co-authored-by: shahnawaz-creator <117025384+shahnawaz-creator@users.noreply.github.com> Co-authored-by: din-mukhammed Co-authored-by: shahnawaz-creator Co-authored-by: Ash-KODES Co-authored-by: Yaroslav Svitlytskyi Co-authored-by: UncertainBadg3r <139782199+UncertainBadg3r@users.noreply.github.com> Co-authored-by: peterlimg Co-authored-by: Tanishq Gupta <52757132+tanishq67@users.noreply.github.com> Co-authored-by: Jayash Satolia Co-authored-by: GuruHubb Co-authored-by: Gaurang Patel --- constants/context_key.go | 3 +- zboxcore/sdk/blockdownloadworker.go | 1 + zboxcore/sdk/download_reqeust_header.go | 5 ++ zboxcore/sdk/filerefsworker.go | 1 + zboxcore/zboxutil/http.go | 69 ++++++++++++++----------- 5 files changed, 47 insertions(+), 32 deletions(-) diff --git a/constants/context_key.go b/constants/context_key.go index 30764cfee..b4c264035 100644 --- a/constants/context_key.go +++ b/constants/context_key.go @@ -16,5 +16,6 @@ const ( ContextKeyAllocationID ContextKey = "allocation_id" // ContextKeyClientSignatureHeaderKey represents key for context value passed with common.ClientSignatureHeader request header. - ContextKeyClientSignatureHeaderKey ContextKey = "signature" + ContextKeyClientSignatureHeaderKey ContextKey = "signature" + ContextKeyClientSignatureHeaderV2Key ContextKey = "signature_v2" ) diff --git a/zboxcore/sdk/blockdownloadworker.go b/zboxcore/sdk/blockdownloadworker.go index 9420375fd..b4e48f9ab 100644 --- a/zboxcore/sdk/blockdownloadworker.go +++ b/zboxcore/sdk/blockdownloadworker.go @@ -136,6 +136,7 @@ func (req *BlockDownloadRequest) downloadBlobberBlock() { header.NumBlocks = req.numBlocks header.VerifyDownload = req.shouldVerify header.ConnectionID = req.connectionID + header.Version = "v2" if req.authTicket != nil { header.AuthToken, _ = json.Marshal(req.authTicket) //nolint: errcheck diff --git a/zboxcore/sdk/download_reqeust_header.go b/zboxcore/sdk/download_reqeust_header.go index 3606e4618..c447e0db9 100644 --- a/zboxcore/sdk/download_reqeust_header.go +++ b/zboxcore/sdk/download_reqeust_header.go @@ -18,6 +18,7 @@ type DownloadRequestHeader struct { DownloadMode string VerifyDownload bool ConnectionID string + Version string } // ToHeader update header @@ -51,5 +52,9 @@ func (h *DownloadRequestHeader) ToHeader(req *http.Request) { req.Header.Set("X-Connection-ID", h.ConnectionID) } + if h.Version != "" { + req.Header.Set("X-Version", h.Version) + } + req.Header.Set("X-Verify-Download", fmt.Sprint(h.VerifyDownload)) } diff --git a/zboxcore/sdk/filerefsworker.go b/zboxcore/sdk/filerefsworker.go index e0f40fb2c..4aabd0683 100644 --- a/zboxcore/sdk/filerefsworker.go +++ b/zboxcore/sdk/filerefsworker.go @@ -116,6 +116,7 @@ func (o *ObjectTreeRequest) getFileRefs(oTR *oTreeResponse, bUrl string) { oReq, err := zboxutil.NewRefsRequest( bUrl, o.allocationID, + o.allocationTx, o.remotefilepath, o.pathHash, o.authToken, diff --git a/zboxcore/zboxutil/http.go b/zboxcore/zboxutil/http.go index 73c0519e0..8b30c32d5 100644 --- a/zboxcore/zboxutil/http.go +++ b/zboxcore/zboxutil/http.go @@ -76,8 +76,9 @@ const ( REDEEM_ENDPOINT = "/v1/connection/redeem/" // CLIENT_SIGNATURE_HEADER represents http request header contains signature. - CLIENT_SIGNATURE_HEADER = "X-App-Client-Signature" - ALLOCATION_ID_HEADER = "ALLOCATION-ID" + CLIENT_SIGNATURE_HEADER = "X-App-Client-Signature" + CLIENT_SIGNATURE_HEADER_V2 = "X-App-Client-Signature-V2" + ALLOCATION_ID_HEADER = "ALLOCATION-ID" ) func getEnvAny(names ...string) string { @@ -167,15 +168,22 @@ func setClientInfo(req *http.Request) { req.Header.Set("X-App-Client-Key", client.GetClientPublicKey()) } -func setClientInfoWithSign(req *http.Request, allocation string) error { +func setClientInfoWithSign(req *http.Request, allocation, baseURL string) error { setClientInfo(req) - sign, err := client.Sign(encryption.Hash(allocation)) + hashData := allocation + sign, err := client.Sign(encryption.Hash(hashData)) if err != nil { return err } req.Header.Set(CLIENT_SIGNATURE_HEADER, sign) + hashData = allocation + baseURL + sign, err = client.Sign(encryption.Hash(hashData)) + if err != nil { + return err + } + req.Header.Set(CLIENT_SIGNATURE_HEADER_V2, sign) return nil } @@ -216,7 +224,7 @@ func NewReferencePathRequest(baseUrl, allocationID string, allocationTx string, return nil, err } - if err := setClientInfoWithSign(req, allocationTx); err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseUrl); err != nil { return nil, err } @@ -262,7 +270,7 @@ func NewObjectTreeRequest(baseUrl, allocationID string, allocationTx string, pat return nil, err } - if err := setClientInfoWithSign(req, allocationTx); err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseUrl); err != nil { return nil, err } @@ -271,7 +279,7 @@ func NewObjectTreeRequest(baseUrl, allocationID string, allocationTx string, pat return req, nil } -func NewRefsRequest(baseUrl, allocationID, path, pathHash, authToken, offsetPath, updatedDate, offsetDate, fileType, refType string, level, pageLimit int) (*http.Request, error) { +func NewRefsRequest(baseUrl, allocationID, allocationTx, path, pathHash, authToken, offsetPath, updatedDate, offsetDate, fileType, refType string, level, pageLimit int) (*http.Request, error) { nUrl, err := joinUrl(baseUrl, REFS_ENDPOINT, allocationID) if err != nil { return nil, err @@ -295,7 +303,7 @@ func NewRefsRequest(baseUrl, allocationID, path, pathHash, authToken, offsetPath req.Header.Set(ALLOCATION_ID_HEADER, allocationID) - if err := setClientInfoWithSign(req, allocationID); err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseUrl); err != nil { return nil, err } @@ -321,7 +329,7 @@ func NewRecentlyAddedRefsRequest(bUrl, allocID, allocTx string, fromDate, offset req.Header.Set(ALLOCATION_ID_HEADER, allocID) - if err = setClientInfoWithSign(req, allocID); err != nil { + if err := setClientInfoWithSign(req, allocTx, bUrl); err != nil { return nil, err } @@ -356,7 +364,7 @@ func NewCollaboratorRequest(baseUrl string, allocationID string, allocationTx st return nil, err } - if err := setClientInfoWithSign(req, allocationTx); err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseUrl); err != nil { return nil, err } @@ -376,7 +384,7 @@ func GetCollaboratorsRequest(baseUrl string, allocationID string, allocationTx s return nil, err } - if err := setClientInfoWithSign(req, allocationTx); err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseUrl); err != nil { return nil, err } @@ -397,7 +405,7 @@ func DeleteCollaboratorRequest(baseUrl string, allocationID string, allocationTx return nil, err } - if err := setClientInfoWithSign(req, allocationTx); err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseUrl); err != nil { return nil, err } @@ -416,8 +424,7 @@ func NewFileMetaRequest(baseUrl string, allocationID string, allocationTx string return nil, err } - err = setClientInfoWithSign(req, allocationTx) - if err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseUrl); err != nil { return nil, err } @@ -436,7 +443,7 @@ func NewFileStatsRequest(baseUrl string, allocationID string, allocationTx strin return nil, err } - if err := setClientInfoWithSign(req, allocationTx); err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseUrl); err != nil { return nil, err } @@ -487,7 +494,7 @@ func NewUploadRequestWithMethod(baseURL, allocationID string, allocationTx strin } // set header: X-App-Client-Signature - if err := setClientInfoWithSign(req, allocationTx); err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseURL); err != nil { return nil, err } @@ -513,8 +520,7 @@ func NewWriteMarkerLockRequest( return nil, err } - err = setClientInfoWithSign(req, allocationTx) - if err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseURL); err != nil { return nil, err } @@ -536,8 +542,7 @@ func NewWriteMarkerUnLockRequest( return nil, err } - err = setClientInfoWithSign(req, allocationTx) - if err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseURL); err != nil { return nil, err } @@ -562,7 +567,7 @@ func NewUploadRequest(baseUrl, allocationID string, allocationTx string, body io return nil, err } - if err := setClientInfoWithSign(req, allocationTx); err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseUrl); err != nil { return nil, err } @@ -581,7 +586,7 @@ func NewConnectionRequest(baseUrl, allocationID string, allocationTx string, bod return nil, err } - if err := setClientInfoWithSign(req, allocationTx); err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseUrl); err != nil { return nil, err } @@ -602,7 +607,7 @@ func NewRenameRequest(baseUrl, allocationID string, allocationTx string, body io return nil, err } - if err := setClientInfoWithSign(req, allocationTx); err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseUrl); err != nil { return nil, err } @@ -622,7 +627,7 @@ func NewCopyRequest(baseUrl, allocationID string, allocationTx string, body io.R return nil, err } - if err := setClientInfoWithSign(req, allocationTx); err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseUrl); err != nil { return nil, err } @@ -642,7 +647,7 @@ func NewMoveRequest(baseUrl, allocationID string, allocationTx string, body io.R return nil, err } - if err := setClientInfoWithSign(req, allocationTx); err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseUrl); err != nil { return nil, err } @@ -662,7 +667,9 @@ func NewDownloadRequest(baseUrl, allocationID, allocationTx string) (*http.Reque if err != nil { return nil, err } - setClientInfo(req) + if err := setClientInfoWithSign(req, allocationTx, baseUrl); err != nil { + return nil, err + } req.Header.Set(ALLOCATION_ID_HEADER, allocationID) @@ -696,7 +703,7 @@ func NewDeleteRequest(baseUrl, allocationID string, allocationTx string, query * return nil, err } - if err := setClientInfoWithSign(req, allocationTx); err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseUrl); err != nil { return nil, err } @@ -716,7 +723,7 @@ func NewCreateDirRequest(baseUrl, allocationID string, allocationTx string, body return nil, err } - if err := setClientInfoWithSign(req, allocationTx); err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseUrl); err != nil { return nil, err } @@ -736,7 +743,7 @@ func NewShareRequest(baseUrl, allocationID string, allocationTx string, body io. return nil, err } - if err := setClientInfoWithSign(req, allocationTx); err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseUrl); err != nil { return nil, err } @@ -756,7 +763,7 @@ func NewRevokeShareRequest(baseUrl, allocationID string, allocationTx string, qu return nil, err } - if err := setClientInfoWithSign(req, allocationTx); err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseUrl); err != nil { return nil, err } @@ -777,7 +784,7 @@ func NewWritemarkerRequest(baseUrl, allocationID, allocationTx string) (*http.Re return nil, err } - if err := setClientInfoWithSign(req, allocationTx); err != nil { + if err := setClientInfoWithSign(req, allocationTx, baseUrl); err != nil { return nil, err }