Skip to content

Commit 7cf028c

Browse files
enfipyenfipy
committed
Move go.mod. Add extern out logic
1 parent dfe62fb commit 7cf028c

29 files changed

+33
-28
lines changed

‎bindings/go/api/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package api
22

33
import (
4-
ffi "github.com/VeriBlock/alt-integration-cpp/ffi"
4+
ffi "github.com/VeriBlock/alt-integration-cpp/bindings/go/ffi"
55
)
66

77
// Config - Configuration for Veriblock integration

‎bindings/go/api/extern.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package api
22

33
import (
4-
ffi "github.com/VeriBlock/alt-integration-cpp/ffi"
4+
ffi "github.com/VeriBlock/alt-integration-cpp/bindings/go/ffi"
55
)
66

77
// SetOnGetAltchainID ...

‎bindings/go/api/pop_context.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"errors"
66
"sync"
77

8-
entities "github.com/VeriBlock/alt-integration-cpp/entities"
9-
ffi "github.com/VeriBlock/alt-integration-cpp/ffi"
8+
entities "github.com/VeriBlock/alt-integration-cpp/bindings/go/entities"
9+
ffi "github.com/VeriBlock/alt-integration-cpp/bindings/go/ffi"
1010
)
1111

1212
// AltBlockTree ...

‎bindings/go/api/pop_context_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package api
33
import (
44
"testing"
55

6-
entities "github.com/VeriBlock/alt-integration-cpp/entities"
6+
entities "github.com/VeriBlock/alt-integration-cpp/bindings/go/entities"
77
"github.com/stretchr/testify/assert"
88
)
99

‎bindings/go/entities/address.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"errors"
77
"io"
88

9-
veriblock "github.com/VeriBlock/alt-integration-cpp"
9+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
1010
)
1111

1212
// AddressType ...

‎bindings/go/entities/alt_block_addon.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"io"
55
"math"
66

7-
veriblock "github.com/VeriBlock/alt-integration-cpp"
7+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
88
)
99

1010
// AltBlockAddon ...

‎bindings/go/entities/alt_endorsement.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package entities
33
import (
44
"io"
55

6-
veriblock "github.com/VeriBlock/alt-integration-cpp"
6+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
77
)
88

99
// AltEndorsement ...

‎bindings/go/entities/atv_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"encoding/hex"
66
"testing"
77

8-
veriblock "github.com/VeriBlock/alt-integration-cpp"
8+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
99
"github.com/stretchr/testify/assert"
1010
)
1111

‎bindings/go/entities/block_index.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/binary"
55
"io"
66

7-
veriblock "github.com/VeriBlock/alt-integration-cpp"
7+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
88
)
99

1010
// BlockStatus ...

‎bindings/go/entities/btc_block_addon.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"io"
66
"math"
77

8-
veriblock "github.com/VeriBlock/alt-integration-cpp"
8+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
99
)
1010

1111
// BtcBlockAddon ...

‎bindings/go/entities/btcblock.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"encoding/binary"
77
"io"
88

9-
veriblock "github.com/VeriBlock/alt-integration-cpp"
9+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
1010
)
1111

1212
// BtcBlock ...

‎bindings/go/entities/btctx.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package entities
33
import (
44
"io"
55

6-
veriblock "github.com/VeriBlock/alt-integration-cpp"
6+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
77
)
88

99
// BtcTx ...

‎bindings/go/entities/coin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package entities
33
import (
44
"io"
55

6-
veriblock "github.com/VeriBlock/alt-integration-cpp"
6+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
77
)
88

99
// Coin ...

‎bindings/go/entities/merkle_path.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"io"
88
"unsafe"
99

10-
veriblock "github.com/VeriBlock/alt-integration-cpp"
10+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
1111
)
1212

1313
// MerklePath ...

‎bindings/go/entities/pop_state.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package entities
33
import (
44
"io"
55

6-
veriblock "github.com/VeriBlock/alt-integration-cpp"
6+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
77
)
88

99
// Endorsement ...

‎bindings/go/entities/popdata.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"io"
77

8-
veriblock "github.com/VeriBlock/alt-integration-cpp"
8+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
99
)
1010

1111
// PopData ...

‎bindings/go/entities/publication_data.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package entities
33
import (
44
"io"
55

6-
veriblock "github.com/VeriBlock/alt-integration-cpp"
6+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
77
)
88

99
// PublicationData ...

‎bindings/go/entities/vbk_block_addon.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"io"
66
"math"
77

8-
veriblock "github.com/VeriBlock/alt-integration-cpp"
8+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
99
)
1010

1111
// VbkBlockAddon ...

‎bindings/go/entities/vbk_endorsement.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package entities
33
import (
44
"io"
55

6-
veriblock "github.com/VeriBlock/alt-integration-cpp"
6+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
77
)
88

99
// VbkEndorsement ...

‎bindings/go/entities/vbk_merkle_path.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package entities
33
import (
44
"io"
55

6-
veriblock "github.com/VeriBlock/alt-integration-cpp"
6+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
77
)
88

99
// VbkMerklePath ...

‎bindings/go/entities/vbkblock.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"encoding/binary"
66
"io"
77

8-
veriblock "github.com/VeriBlock/alt-integration-cpp"
8+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
99
)
1010

1111
// VbkBlock ...

‎bindings/go/entities/vbkpoptx.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"crypto/sha256"
66
"io"
77

8-
veriblock "github.com/VeriBlock/alt-integration-cpp"
8+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
99
)
1010

1111
// VbkPopTx ...

‎bindings/go/entities/vbkpoptx_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"encoding/hex"
66
"testing"
77

8-
veriblock "github.com/VeriBlock/alt-integration-cpp"
8+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
99
"github.com/stretchr/testify/assert"
1010
)
1111

‎bindings/go/entities/vbktx.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"encoding/binary"
66
"io"
77

8-
veriblock "github.com/VeriBlock/alt-integration-cpp"
8+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
99
)
1010

1111
// VbkTx ...

‎bindings/go/entities/vbktx_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"encoding/hex"
66
"testing"
77

8-
veriblock "github.com/VeriBlock/alt-integration-cpp"
8+
veriblock "github.com/VeriBlock/alt-integration-cpp/bindings/go"
99
"github.com/stretchr/testify/assert"
1010
)
1111

‎bindings/go/ffi/extern.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package ffi
44
// #cgo LDFLAGS: -lveriblock-pop-cpp -lstdc++
55
// #include <veriblock/c/config.h>
66
import "C"
7+
import "unsafe"
78

89
//export VBK_getAltchainId
910
func VBK_getAltchainId() C.int64_t {
@@ -17,7 +18,11 @@ func VBK_getBootstrapBlock() *C.char {
1718

1819
//export VBK_getBlockHeaderHash
1920
func VBK_getBlockHeaderHash(in *C.uint8_t, inlen C.int, out *C.uint8_t, outlen *C.int) {
20-
OnGetBlockHeaderHash()
21+
bytesSize := int(inlen)
22+
resBytes := (*(*[]byte)(unsafe.Pointer(in)))[:bytesSize:bytesSize]
23+
data := OnGetBlockHeaderHash(resBytes)
24+
*outlen = C.int(len(data))
25+
*out = *(*C.uint8_t)(unsafe.Pointer(&data[0]))
2126
}
2227

2328
// PayloadsProvider externs

‎bindings/go/ffi/pop_context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import "unsafe"
1010
var (
1111
OnGetAltchainID = func() int { panic("OnGetAltchainID not set") }
1212
OnGetBootstrapBlock = func() string { panic("OnGetBootstrapBlock not set") }
13-
OnGetBlockHeaderHash = func() { panic("OnGetBlockHeaderHash not set") }
13+
OnGetBlockHeaderHash = func(toBeHashed []byte) []byte { panic("OnGetBlockHeaderHash not set") }
1414
OnGetAtv = func() { panic("OnGetAtv not set") }
1515
OnGetVtb = func() { panic("OnGetVtb not set") }
1616
OnGetVbk = func() { panic("OnGetVbk not set") }

‎bindings/go/go.mod renamed to ‎go.mod

File renamed without changes.

‎bindings/go/go.sum renamed to ‎go.sum

File renamed without changes.

0 commit comments

Comments
 (0)