Browse Source

round 4

pull/123/head
notgiven688 2 years ago
parent
commit
b69b4bb2e6
7 changed files with 35 additions and 40 deletions
  1. +29
    -30
      SDK/miner_compressed/webmr.js
  2. +1
    -1
      SDK/miner_raw/miner/cn.js
  3. +0
    -1
      SDK/miner_raw/miner/miner.js
  4. +2
    -3
      hash_cn/libhash/cryptonight.c
  5. +1
    -1
      hash_cn/webassembly/Makefile
  6. +2
    -3
      hash_cn/webassembly/cryptonight.c
  7. +0
    -1
      server/Server/Server.csproj

+ 29
- 30
SDK/miner_compressed/webmr.js
File diff suppressed because it is too large
View File


+ 1
- 1
SDK/miner_raw/miner/cn.js
File diff suppressed because it is too large
View File


+ 0
- 1
SDK/miner_raw/miner/miner.js View File

@ -241,7 +241,6 @@ function informWorker(wrk) {
}
function on_servermsg(e) {
console.log(e.data);
var obj = JSON.parse(e.data);
receiveStack.push(obj);

+ 2
- 3
hash_cn/libhash/cryptonight.c View File

@ -693,9 +693,8 @@ void cryptonight_hash_ctx(void *output, const void *input, size_t len, int algo,
memcpy(text, state.init, INIT_SIZE_BYTE);
// TODO: check mem leaks
//oaes_free((OAES_CTX **)&aes_ctx);
//aes_ctx = (oaes_ctx *)oaes_alloc();
oaes_free((OAES_CTX **)&aes_ctx);
aes_ctx = (oaes_ctx *)oaes_alloc();
oaes_key_import_data(aes_ctx, &state.hs.b[32], AES_KEY_SIZE);

+ 1
- 1
hash_cn/webassembly/Makefile View File

@ -1,7 +1,7 @@
TARGET = prog
LIBS = -lm
CC = emcc -O3 -s NO_FILESYSTEM=1 -s 'EXTRA_EXPORTED_RUNTIME_METHODS=["ccall", "cwrap"]' --llvm-lto 1 -s TOTAL_MEMORY=67108864 -s WASM=1 -s "BINARYEN_TRAP_MODE='allow'" -s EXPORTED_FUNCTIONS="['_hash_cn']" --shell-file html_template/shell_minimal.html
CC = emcc -O3 -s SINGLE_FILE=1 -s NO_FILESYSTEM=1 -s 'EXTRA_EXPORTED_RUNTIME_METHODS=["ccall", "cwrap"]' --llvm-lto 1 -s TOTAL_MEMORY=67108864 -s WASM=1 -s "BINARYEN_TRAP_MODE='allow'" -s EXPORTED_FUNCTIONS="['_hash_cn']" --shell-file html_template/shell_minimal.html
CFLAGS = -Wall
# -s ASSERTIONS=1

+ 2
- 3
hash_cn/webassembly/cryptonight.c View File

@ -693,9 +693,8 @@ void cryptonight_hash_ctx(void *output, const void *input, size_t len, int algo,
memcpy(text, state.init, INIT_SIZE_BYTE);
// TODO: check mem leaks
//oaes_free((OAES_CTX **)&aes_ctx);
//aes_ctx = (oaes_ctx *)oaes_alloc();
oaes_free((OAES_CTX **)&aes_ctx);
aes_ctx = (oaes_ctx *)oaes_alloc();
oaes_key_import_data(aes_ctx, &state.hs.b[32], AES_KEY_SIZE);

+ 0
- 1
server/Server/Server.csproj View File

@ -85,7 +85,6 @@
<Compile Include="Helper.cs" />
<Compile Include="Random2.cs" />
<Compile Include="AlgorithmHelper.cs">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Compile>
</ItemGroup>
<ItemGroup>

Loading…
Cancel
Save