aboutsummaryrefslogtreecommitdiffstats
path: root/Godeps
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-03-20 18:40:46 +0800
committerobscuren <geffobscura@gmail.com>2015-03-20 18:40:46 +0800
commit01ff0b3176e6d83dcc5e6716f04301de71e3fc9e (patch)
treeffb8fe987f992e16f7d119f40a97d498022d4959 /Godeps
parentd8fe8f60e84f599a92783bd690b8d3477cf5a595 (diff)
downloaddexon-01ff0b3176e6d83dcc5e6716f04301de71e3fc9e.tar
dexon-01ff0b3176e6d83dcc5e6716f04301de71e3fc9e.tar.gz
dexon-01ff0b3176e6d83dcc5e6716f04301de71e3fc9e.tar.bz2
dexon-01ff0b3176e6d83dcc5e6716f04301de71e3fc9e.tar.lz
dexon-01ff0b3176e6d83dcc5e6716f04301de71e3fc9e.tar.xz
dexon-01ff0b3176e6d83dcc5e6716f04301de71e3fc9e.tar.zst
dexon-01ff0b3176e6d83dcc5e6716f04301de71e3fc9e.zip
fixed ethash
Diffstat (limited to 'Godeps')
-rw-r--r--Godeps/Godeps.json4
-rw-r--r--Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go4
2 files changed, 4 insertions, 4 deletions
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 0cdb4b026..b97dec91f 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -22,8 +22,8 @@
},
{
"ImportPath": "github.com/ethereum/ethash",
- "Comment": "v23.1-25-gc0429f2",
- "Rev": "c0429f268b62e2238b684d4b5495f8ff24115424"
+ "Comment": "v23.1-26-g934bb4f",
+ "Rev": "934bb4f5060ab69d96fb6eba4b9a57facc4e160b"
},
{
"ImportPath": "github.com/ethereum/serpent-go",
diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go b/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go
index 8c325d25d..3c24fd239 100644
--- a/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go
+++ b/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go
@@ -85,7 +85,7 @@ func makeParamsAndCache(chainManager pow.ChainManager, blockNum uint64) (*Params
Epoch: blockNum / epochLength,
}
C.ethash_params_init(paramsAndCache.params, C.uint32_t(uint32(blockNum)))
- paramsAndCache.cache.mem = C.malloc(paramsAndCache.params.cache_size)
+ paramsAndCache.cache.mem = C.malloc(C.size_t(paramsAndCache.params.cache_size))
seedHash, err := GetSeedHash(blockNum)
if err != nil {
@@ -118,7 +118,7 @@ func (pow *Ethash) UpdateCache(force bool) error {
func makeDAG(p *ParamsAndCache) *DAG {
d := &DAG{
- dag: C.malloc(p.params.full_size),
+ dag: C.malloc(C.size_t(p.params.full_size)),
file: false,
paramsAndCache: p,
}