Skip to content

Commit a9ee606

Browse files
committed
simplicity-sys: add versions to jet prefixes
As before, I first manually added _0_3_ version numbers, modified the vendoring script, ran it, and made sure that the resulting diff added 0_4s and worked.
1 parent be859b8 commit a9ee606

File tree

2 files changed

+38
-19
lines changed

2 files changed

+38
-19
lines changed

simplicity-sys/depend/env.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,32 @@
33
#include "simplicity/elements/env.h"
44
#include "simplicity/primitive/elements/primitive.h"
55

6-
const size_t c_sizeof_rawBuffer = sizeof(rawBuffer);
7-
const size_t c_sizeof_rawOutput = sizeof(rawOutput);
8-
const size_t c_sizeof_rawInput = sizeof(rawInput);
9-
const size_t c_sizeof_rawTransaction = sizeof(rawTransaction);
10-
const size_t c_sizeof_rawTapEnv = sizeof(rawTapEnv);
11-
const size_t c_sizeof_txEnv = sizeof(txEnv);
6+
const size_t rustsimplicity_0_4_c_sizeof_rawBuffer = sizeof(rawBuffer);
7+
const size_t rustsimplicity_0_4_c_sizeof_rawOutput = sizeof(rawOutput);
8+
const size_t rustsimplicity_0_4_c_sizeof_rawInput = sizeof(rawInput);
9+
const size_t rustsimplicity_0_4_c_sizeof_rawTransaction = sizeof(rawTransaction);
10+
const size_t rustsimplicity_0_4_c_sizeof_rawTapEnv = sizeof(rawTapEnv);
11+
const size_t rustsimplicity_0_4_c_sizeof_txEnv = sizeof(txEnv);
1212

13-
const size_t c_alignof_rawBuffer = alignof(rawBuffer);
14-
const size_t c_alignof_rawOutput = alignof(rawOutput);
15-
const size_t c_alignof_rawInput = alignof(rawInput);
16-
const size_t c_alignof_rawTransaction = alignof(rawTransaction);
17-
const size_t c_alignof_rawTapEnv = alignof(rawTapEnv);
18-
const size_t c_alignof_txEnv = alignof(txEnv);
13+
const size_t rustsimplicity_0_4_c_alignof_rawBuffer = alignof(rawBuffer);
14+
const size_t rustsimplicity_0_4_c_alignof_rawOutput = alignof(rawOutput);
15+
const size_t rustsimplicity_0_4_c_alignof_rawInput = alignof(rawInput);
16+
const size_t rustsimplicity_0_4_c_alignof_rawTransaction = alignof(rawTransaction);
17+
const size_t rustsimplicity_0_4_c_alignof_rawTapEnv = alignof(rawTapEnv);
18+
const size_t rustsimplicity_0_4_c_alignof_txEnv = alignof(txEnv);
1919

20-
void c_set_rawBuffer(rawBuffer *result, const unsigned char *buf, unsigned int len)
20+
void rustsimplicity_0_4_c_set_rawBuffer(rawBuffer *result, const unsigned char *buf, unsigned int len)
2121
{
2222
*result = (rawBuffer){.buf = buf, .len = len};
2323
}
2424

25-
void c_set_rawOutput(rawOutput *result, const unsigned char *asset, const unsigned char *value, const unsigned char *nonce, const rawBuffer *scriptPubKey,
25+
void rustsimplicity_0_4_c_set_rawOutput(rawOutput *result, const unsigned char *asset, const unsigned char *value, const unsigned char *nonce, const rawBuffer *scriptPubKey,
2626
const rawBuffer *surjectionProof, const rawBuffer *rangeProof)
2727
{
2828
*result = (rawOutput){.asset = asset, .value = value, .nonce = nonce, .scriptPubKey = *scriptPubKey, .surjectionProof = *surjectionProof, .rangeProof = *rangeProof};
2929
}
3030

31-
void c_set_rawInput(rawInput *result, const rawBuffer *annex, const unsigned char *pegin, const rawBuffer *scriptSig,
31+
void rustsimplicity_0_4_c_set_rawInput(rawInput *result, const rawBuffer *annex, const unsigned char *pegin, const rawBuffer *scriptSig,
3232
const unsigned char *prevTxid, unsigned int prevIx,
3333
const unsigned char *asset, const unsigned char *value, const rawBuffer *scriptPubKey,
3434
unsigned int sequence,
@@ -38,7 +38,7 @@ void c_set_rawInput(rawInput *result, const rawBuffer *annex, const unsigned cha
3838
*result = (rawInput){.annex = annex, .scriptSig = *scriptSig, .prevTxid = prevTxid, .pegin = pegin, .issuance = {.blindingNonce = blindingNonce, .assetEntropy = assetEntropy, .amount = amount, .inflationKeys = inflationKeys, .amountRangePrf = *amountRangePrf, .inflationKeysRangePrf = *inflationKeysRangePrf}, .txo = {.asset = asset, .value = value, .scriptPubKey = *scriptPubKey}, .prevIx = prevIx, .sequence = sequence};
3939
}
4040

41-
void c_set_rawTransaction(rawTransaction *result, unsigned int version,
41+
void rustsimplicity_0_4_c_set_rawTransaction(rawTransaction *result, unsigned int version,
4242
const unsigned char *txid,
4343
const rawInput *input, unsigned int numInputs,
4444
const rawOutput *output, unsigned int numOutputs,
@@ -55,12 +55,12 @@ void c_set_rawTransaction(rawTransaction *result, unsigned int version,
5555
};
5656
}
5757

58-
void c_set_rawTapEnv(rawTapEnv *result, const unsigned char *controlBlock, unsigned char pathLen, const unsigned char *scriptCMR)
58+
void rustsimplicity_0_4_c_set_rawTapEnv(rawTapEnv *result, const unsigned char *controlBlock, unsigned char pathLen, const unsigned char *scriptCMR)
5959
{
6060
*result = (rawTapEnv){.controlBlock = controlBlock, .pathLen = pathLen, .scriptCMR = scriptCMR};
6161
}
6262

63-
void c_set_txEnv(txEnv *result, const transaction *tx, const tapEnv *taproot, const unsigned char *genesisHash, unsigned int ix)
63+
void rustsimplicity_0_4_c_set_txEnv(txEnv *result, const transaction *tx, const tapEnv *taproot, const unsigned char *genesisHash, unsigned int ix)
6464
{
6565
sha256_midstate genesis;
6666
sha256_toMidstate(genesis.s, genesisHash);

simplicity-sys/src/c_jets/c_env.rs

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,22 +125,35 @@ pub struct CElementsTxEnv {
125125
pub enum CTapEnv {}
126126

127127
extern "C" {
128-
128+
#[link_name = "rustsimplicity_0_4_c_sizeof_rawBuffer"]
129129
pub static c_sizeof_rawBuffer: c_size_t;
130+
#[link_name = "rustsimplicity_0_4_c_sizeof_rawOutput"]
130131
pub static c_sizeof_rawOutput: c_size_t;
132+
#[link_name = "rustsimplicity_0_4_c_sizeof_rawInput"]
131133
pub static c_sizeof_rawInput: c_size_t;
134+
#[link_name = "rustsimplicity_0_4_c_sizeof_rawTransaction"]
132135
pub static c_sizeof_rawTransaction: c_size_t;
136+
#[link_name = "rustsimplicity_0_4_c_sizeof_rawTapEnv"]
133137
pub static c_sizeof_rawTapEnv: c_size_t;
138+
#[link_name = "rustsimplicity_0_4_c_sizeof_txEnv"]
134139
pub static c_sizeof_txEnv: c_size_t;
135140

141+
#[link_name = "rustsimplicity_0_4_c_alignof_rawBuffer"]
136142
pub static c_alignof_rawBuffer: c_size_t;
143+
#[link_name = "rustsimplicity_0_4_c_alignof_rawOutput"]
137144
pub static c_alignof_rawOutput: c_size_t;
145+
#[link_name = "rustsimplicity_0_4_c_alignof_rawInput"]
138146
pub static c_alignof_rawInput: c_size_t;
147+
#[link_name = "rustsimplicity_0_4_c_alignof_rawTransaction"]
139148
pub static c_alignof_rawTransaction: c_size_t;
149+
#[link_name = "rustsimplicity_0_4_c_alignof_rawTapEnv"]
140150
pub static c_alignof_rawTapEnv: c_size_t;
151+
#[link_name = "rustsimplicity_0_4_c_alignof_txEnv"]
141152
pub static c_alignof_txEnv: c_size_t;
142153

154+
#[link_name = "rustsimplicity_0_4_c_set_rawBuffer"]
143155
pub fn c_set_rawBuffer(res: *mut CRawBuffer, buf: *const c_uchar, len: c_uint);
156+
#[link_name = "rustsimplicity_0_4_c_set_rawOutput"]
144157
pub fn c_set_rawOutput(
145158
res: *mut CRawOutput,
146159
asset: *const c_uchar,
@@ -150,6 +163,7 @@ extern "C" {
150163
surjectionProof: *const CRawBuffer,
151164
rangeProof: *const CRawBuffer,
152165
);
166+
#[link_name = "rustsimplicity_0_4_c_set_rawInput"]
153167
pub fn c_set_rawInput(
154168
result: *mut CRawInput,
155169
annex: *const CRawBuffer,
@@ -169,6 +183,7 @@ extern "C" {
169183
inflationKeysRangePrf: *const CRawBuffer,
170184
);
171185

186+
#[link_name = "rustsimplicity_0_4_c_set_rawTransaction"]
172187
pub fn c_set_rawTransaction(
173188
result: *mut CRawTransaction,
174189
version: c_uint,
@@ -179,12 +194,14 @@ extern "C" {
179194
numOutputs: c_uint,
180195
lockTime: c_uint,
181196
);
197+
#[link_name = "rustsimplicity_0_4_c_set_rawTapEnv"]
182198
pub fn c_set_rawTapEnv(
183199
result: *mut CRawTapEnv,
184200
controlBlock: *const c_uchar,
185201
pathLen: c_uchar,
186202
scriptCMR: *const c_uchar,
187203
);
204+
#[link_name = "rustsimplicity_0_4_c_set_txEnv"]
188205
pub fn c_set_txEnv(
189206
result: *mut CElementsTxEnv,
190207
tx: *const CTransaction,
@@ -198,7 +215,9 @@ extern "C" {
198215
pub fn simplicity_elements_mallocTransaction(
199216
rawTx: *const CRawTransaction,
200217
) -> *mut CTransaction;
218+
#[link_name = "rustsimplicity_0_4_c_free_transaction"]
201219
pub fn c_free_transaction(tx: *mut CTransaction);
220+
#[link_name = "rustsimplicity_0_4_c_free_tapEnv"]
202221
pub fn c_free_tapEnv(env: *mut CTapEnv);
203222
}
204223
impl CElementsTxEnv {

0 commit comments

Comments
 (0)