Skip to content

Commit c1591ac

Browse files
dtbuchholzdtbuchholz
authored
feat: contract/abi changes for testnet v0.1.5 (#116)
1 parent 51b328f commit c1591ac

File tree

7 files changed

+60
-65
lines changed

7 files changed

+60
-65
lines changed

‎.changeset/wet-beds-breathe.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@recallnet/network-constants": patch
3+
"@recallnet/contracts": patch
4+
"@recallnet/sdk": patch
5+
---
6+
7+
testnet v0.1.5 updates with new contract addresses and ABI changes for buckets and blobs

‎packages/contracts/contracts

‎packages/contracts/src/index.ts

+24-50
Original file line numberDiff line numberDiff line change
@@ -88,43 +88,12 @@ export const blobManagerAbi = [
8888
internalType: "struct Subscriber[]",
8989
type: "tuple[]",
9090
components: [
91-
{ name: "subscriber", internalType: "address", type: "address" },
9291
{
93-
name: "subscriptionGroup",
94-
internalType: "struct SubscriptionGroup[]",
95-
type: "tuple[]",
96-
components: [
97-
{
98-
name: "subscriptionId",
99-
internalType: "string",
100-
type: "string",
101-
},
102-
{
103-
name: "subscription",
104-
internalType: "struct Subscription",
105-
type: "tuple",
106-
components: [
107-
{ name: "added", internalType: "uint64", type: "uint64" },
108-
{
109-
name: "expiry",
110-
internalType: "uint64",
111-
type: "uint64",
112-
},
113-
{
114-
name: "source",
115-
internalType: "string",
116-
type: "string",
117-
},
118-
{
119-
name: "delegate",
120-
internalType: "address",
121-
type: "address",
122-
},
123-
{ name: "failed", internalType: "bool", type: "bool" },
124-
],
125-
},
126-
],
92+
name: "subscriptionId",
93+
internalType: "string",
94+
type: "string",
12795
},
96+
{ name: "expiry", internalType: "uint64", type: "uint64" },
12897
],
12998
},
13099
{ name: "status", internalType: "enum BlobStatus", type: "uint8" },
@@ -278,7 +247,7 @@ export const blobManagerAbi = [
278247
279248
*/
280249
export const blobManagerAddress = {
281-
2481632: "0xDE2b390bba012f028B75A45190ed28a2838633e3",
250+
2481632: "0x6E3f94065567560c6e1Bbc5e4584127220c15e14",
282251
248163216: "0x8ce361602B935680E8DeC218b820ff5056BeB7af",
283252
} as const;
284253

@@ -495,6 +464,7 @@ export const bucketManagerAbi = [
495464
components: [
496465
{ name: "blobHash", internalType: "string", type: "string" },
497466
{ name: "size", internalType: "uint64", type: "uint64" },
467+
{ name: "expiry", internalType: "uint64", type: "uint64" },
498468
{
499469
name: "metadata",
500470
internalType: "struct KeyValue[]",
@@ -548,6 +518,7 @@ export const bucketManagerAbi = [
548518
components: [
549519
{ name: "blobHash", internalType: "string", type: "string" },
550520
{ name: "size", internalType: "uint64", type: "uint64" },
521+
{ name: "expiry", internalType: "uint64", type: "uint64" },
551522
{
552523
name: "metadata",
553524
internalType: "struct KeyValue[]",
@@ -599,6 +570,7 @@ export const bucketManagerAbi = [
599570
components: [
600571
{ name: "blobHash", internalType: "string", type: "string" },
601572
{ name: "size", internalType: "uint64", type: "uint64" },
573+
{ name: "expiry", internalType: "uint64", type: "uint64" },
602574
{
603575
name: "metadata",
604576
internalType: "struct KeyValue[]",
@@ -651,6 +623,7 @@ export const bucketManagerAbi = [
651623
components: [
652624
{ name: "blobHash", internalType: "string", type: "string" },
653625
{ name: "size", internalType: "uint64", type: "uint64" },
626+
{ name: "expiry", internalType: "uint64", type: "uint64" },
654627
{
655628
name: "metadata",
656629
internalType: "struct KeyValue[]",
@@ -701,6 +674,7 @@ export const bucketManagerAbi = [
701674
components: [
702675
{ name: "blobHash", internalType: "string", type: "string" },
703676
{ name: "size", internalType: "uint64", type: "uint64" },
677+
{ name: "expiry", internalType: "uint64", type: "uint64" },
704678
{
705679
name: "metadata",
706680
internalType: "struct KeyValue[]",
@@ -751,7 +725,7 @@ export const bucketManagerAbi = [
751725
752726
*/
753727
export const bucketManagerAddress = {
754-
2481632: "0x4ce14F0751287Bfcd3ba4A8Ddb46DdA5d36a0b7E",
728+
2481632: "0x7a9Cec860adF2C64274D0aD7fbF0b5Bf0426a200",
755729
248163216: "0xeD1DB453C3156Ff3155a97AD217b3087D5Dc5f6E",
756730
} as const;
757731

@@ -1101,7 +1075,7 @@ export const creditManagerAbi = [
11011075
11021076
*/
11031077
export const creditManagerAddress = {
1104-
2481632: "0x7E6855FF43C2A434707eE9Ff031d450cceB2EcbE",
1078+
2481632: "0x61F50eEC83043a4635956B54EEDf5Eea8CcaBc76",
11051079
248163216: "0x196dBCBb54b8ec4958c959D8949EBFE87aC2Aaaf",
11061080
} as const;
11071081

@@ -1119,7 +1093,7 @@ export const creditManagerConfig = {
11191093

11201094
/**
11211095
* -
1122-
* - [__View Contract on Filecoin Calibration Filscan__](https://calibration.filscan.io/address/0x51eFd78d5B742e730A94e4525dbee97015bEf746)
1096+
* - [__View Contract on Filecoin Calibration Filscan__](https://calibration.filscan.io/address/0x136066500b332e7D72643EE7690E9C708702c7e6)
11231097
*/
11241098
export const gatewayManagerFacetAbi = [
11251099
{
@@ -1366,19 +1340,19 @@ export const gatewayManagerFacetAbi = [
13661340

13671341
/**
13681342
* -
1369-
* - [__View Contract on Filecoin Calibration Filscan__](https://calibration.filscan.io/address/0x51eFd78d5B742e730A94e4525dbee97015bEf746)
1343+
* - [__View Contract on Filecoin Calibration Filscan__](https://calibration.filscan.io/address/0x136066500b332e7D72643EE7690E9C708702c7e6)
13701344
*/
13711345
export const gatewayManagerFacetAddress = {
13721346
31337: "0x9A676e781A523b5d0C0e43731313A708CB607508",
1373-
314159: "0x51eFd78d5B742e730A94e4525dbee97015bEf746",
1347+
314159: "0x136066500b332e7D72643EE7690E9C708702c7e6",
13741348
2481632: "0x77Aa40B105843728088c0132e43FC44348881DA8",
13751349
248163216: "0x77Aa40B105843728088c0132e43FC44348881DA8",
13761350
1942764459484029: "0x77Aa40B105843728088c0132e43FC44348881DA8",
13771351
} as const;
13781352

13791353
/**
13801354
* -
1381-
* - [__View Contract on Filecoin Calibration Filscan__](https://calibration.filscan.io/address/0x51eFd78d5B742e730A94e4525dbee97015bEf746)
1355+
* - [__View Contract on Filecoin Calibration Filscan__](https://calibration.filscan.io/address/0x136066500b332e7D72643EE7690E9C708702c7e6)
13821356
*/
13831357
export const gatewayManagerFacetConfig = {
13841358
address: gatewayManagerFacetAddress,
@@ -1432,7 +1406,7 @@ export const iMachineFacadeAbi = [
14321406

14331407
/**
14341408
* -
1435-
* - [__View Contract on Filecoin Calibration Filscan__](https://calibration.filscan.io/address/0x09f2A3ed21BA70E532F96b57a8733309Cc9087B4)
1409+
* - [__View Contract on Filecoin Calibration Filscan__](https://calibration.filscan.io/address/0x9E5ea73a639484CcE57F865dC1E582Cd01F3251F)
14361410
*/
14371411
export const recallErc20Abi = [
14381412
{
@@ -1534,16 +1508,16 @@ export const recallErc20Abi = [
15341508

15351509
/**
15361510
* -
1537-
* - [__View Contract on Filecoin Calibration Filscan__](https://calibration.filscan.io/address/0x09f2A3ed21BA70E532F96b57a8733309Cc9087B4)
1511+
* - [__View Contract on Filecoin Calibration Filscan__](https://calibration.filscan.io/address/0x9E5ea73a639484CcE57F865dC1E582Cd01F3251F)
15381512
*/
15391513
export const recallErc20Address = {
15401514
31337: "0x4A679253410272dd5232B3Ff7cF5dbB88f295319",
1541-
314159: "0x09f2A3ed21BA70E532F96b57a8733309Cc9087B4",
1515+
314159: "0x9E5ea73a639484CcE57F865dC1E582Cd01F3251F",
15421516
} as const;
15431517

15441518
/**
15451519
* -
1546-
* - [__View Contract on Filecoin Calibration Filscan__](https://calibration.filscan.io/address/0x09f2A3ed21BA70E532F96b57a8733309Cc9087B4)
1520+
* - [__View Contract on Filecoin Calibration Filscan__](https://calibration.filscan.io/address/0x9E5ea73a639484CcE57F865dC1E582Cd01F3251F)
15471521
*/
15481522
export const recallErc20Config = {
15491523
address: recallErc20Address,
@@ -1556,7 +1530,7 @@ export const recallErc20Config = {
15561530

15571531
/**
15581532
* -
1559-
* - [__View Contract on Filecoin Calibration Filscan__](https://calibration.filscan.io/address/0x49E26a7e9B5e9b428D259d7D6644d22C6f6FC14E)
1533+
* - [__View Contract on Filecoin Calibration Filscan__](https://calibration.filscan.io/address/0xdf3Fe12002826Ff617F2d7500c61B72A8e3E9436)
15601534
*/
15611535
export const subnetGetterFacetAbi = [
15621536
{
@@ -1687,19 +1661,19 @@ export const subnetGetterFacetAbi = [
16871661

16881662
/**
16891663
* -
1690-
* - [__View Contract on Filecoin Calibration Filscan__](https://calibration.filscan.io/address/0x49E26a7e9B5e9b428D259d7D6644d22C6f6FC14E)
1664+
* - [__View Contract on Filecoin Calibration Filscan__](https://calibration.filscan.io/address/0xdf3Fe12002826Ff617F2d7500c61B72A8e3E9436)
16911665
*/
16921666
export const subnetGetterFacetAddress = {
16931667
31337: "0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44",
1694-
314159: "0x49E26a7e9B5e9b428D259d7D6644d22C6f6FC14E",
1668+
314159: "0xdf3Fe12002826Ff617F2d7500c61B72A8e3E9436",
16951669
2481632: "0x74539671A1D2F1c8f200826bAbA665179F53a1b7",
16961670
248163216: "0x74539671A1D2F1c8f200826bAbA665179F53a1b7",
16971671
1942764459484029: "0x74539671A1D2F1c8f200826bAbA665179F53a1b7",
16981672
} as const;
16991673

17001674
/**
17011675
* -
1702-
* - [__View Contract on Filecoin Calibration Filscan__](https://calibration.filscan.io/address/0x49E26a7e9B5e9b428D259d7D6644d22C6f6FC14E)
1676+
* - [__View Contract on Filecoin Calibration Filscan__](https://calibration.filscan.io/address/0xdf3Fe12002826Ff617F2d7500c61B72A8e3E9436)
17031677
*/
17041678
export const subnetGetterFacetConfig = {
17051679
address: subnetGetterFacetAddress,

‎packages/network-constants/src/index.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Subnet IDs
22
export const TESTNET_SUBNET_ID =
3-
"/r314159/t410fr65mgmqd6t7o2u3x3ptpjsd4olrrmzddkwkj2ta";
3+
"/r314159/t410frrql2ooeoz2t4hlor3hqw33druwnc4jzhajdbeq";
44
export const LOCALNET_SUBNET_ID =
55
"/r31337/t410f6gbdxrbehnaeeo4mrq7wc5hgq6smnefys4qanwi";
66
export const DEVNET_SUBNET_ID = "test";
@@ -53,7 +53,7 @@ export const MAX_OBJECT_SIZE = 5_000_000_000; // 5GB
5353

5454
// Gateway Manager Facet contract addresses
5555
export const TESTNET_PARENT_GATEWAY_MANAGER_FACET_ADDRESS =
56-
"0x51eFd78d5B742e730A94e4525dbee97015bEf746";
56+
"0x136066500b332e7D72643EE7690E9C708702c7e6";
5757
export const TESTNET_GATEWAY_MANAGER_FACET_ADDRESS =
5858
"0x77aa40b105843728088c0132e43fc44348881da8";
5959
export const LOCALNET_PARENT_GATEWAY_MANAGER_FACET_ADDRESS =
@@ -65,7 +65,7 @@ export const DEVNET_GATEWAY_MANAGER_FACET_ADDRESS =
6565

6666
// Subnet Getter (Registry) Facet contract addresses
6767
export const TESTNET_PARENT_SUBNET_GETTER_FACET_ADDRESS =
68-
"0x49E26a7e9B5e9b428D259d7D6644d22C6f6FC14E";
68+
"0xdf3Fe12002826Ff617F2d7500c61B72A8e3E9436";
6969
export const LOCALNET_PARENT_SUBNET_GETTER_FACET_ADDRESS =
7070
"0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44";
7171
export const TESTNET_SUBNET_GETTER_FACET_ADDRESS =
@@ -77,24 +77,24 @@ export const DEVNET_SUBNET_GETTER_FACET_ADDRESS =
7777

7878
// ERC20 contract addresses
7979
export const TESTNET_PARENT_ERC20_ADDRESS =
80-
"0x09f2A3ed21BA70E532F96b57a8733309Cc9087B4";
80+
"0x9E5ea73a639484CcE57F865dC1E582Cd01F3251F";
8181
export const LOCALNET_PARENT_ERC20_ADDRESS =
8282
"0x4A679253410272dd5232B3Ff7cF5dbB88f295319";
8383

8484
// BlobManager contract addresses
8585
export const TESTNET_BLOB_MANAGER_ADDRESS =
86-
"0xDE2b390bba012f028B75A45190ed28a2838633e3";
86+
"0x6E3f94065567560c6e1Bbc5e4584127220c15e14";
8787
export const LOCALNET_BLOB_MANAGER_ADDRESS =
8888
"0x8ce361602B935680E8DeC218b820ff5056BeB7af";
8989

9090
// BucketManager contract addresses
9191
export const TESTNET_BUCKET_MANAGER_ADDRESS =
92-
"0x4ce14F0751287Bfcd3ba4A8Ddb46DdA5d36a0b7E";
92+
"0x7a9Cec860adF2C64274D0aD7fbF0b5Bf0426a200";
9393
export const LOCALNET_BUCKET_MANAGER_ADDRESS =
9494
"0xeD1DB453C3156Ff3155a97AD217b3087D5Dc5f6E";
9595

9696
// CreditManager contract addresses
9797
export const TESTNET_CREDIT_MANAGER_ADDRESS =
98-
"0x7E6855FF43C2A434707eE9Ff031d450cceB2EcbE";
98+
"0x61F50eEC83043a4635956B54EEDf5Eea8CcaBc76";
9999
export const LOCALNET_CREDIT_MANAGER_ADDRESS =
100100
"0x196dBCBb54b8ec4958c959D8949EBFE87aC2Aaaf";

‎packages/sdk/src/entities/bucket.ts

+1
Original file line numberDiff line numberDiff line change
@@ -556,6 +556,7 @@ export class BucketManager {
556556
state: {
557557
blobHash: state.blobHash,
558558
size: state.size,
559+
expiry: state.expiry,
559560
metadata: convertAbiMetadataToObject(state.metadata),
560561
},
561562
})),

‎packages/sdk/test/contracts.test.ts

+19-6
Original file line numberDiff line numberDiff line change
@@ -94,20 +94,20 @@ describe("contracts", function () {
9494
let bucket: Address; // Note: FVM uses all lowercase, but viem returns the checksummed address (may include uppercase)
9595
const key = "hello/world";
9696
const fileContents = "hello\n";
97-
const blobHash = "rzghyg4z3p6vbz5jkgc75lk64fci7kieul65o6hk6xznx7lctkmq";
9897

9998
before(async () => {
10099
({
101100
result: { bucket },
102101
} = await bucketManager.create());
103102
});
104103

105-
it("should add object from file", async () => {
104+
it("should add object from file with metadata and overwrite", async () => {
106105
const path = await temporaryWrite(fileContents);
107106
const opts = {
108107
metadata: {
109108
foo: "bar",
110109
},
110+
overwrite: true,
111111
};
112112
const { meta } = await bucketManager.add(bucket, key, path, opts);
113113
strictEqual(isHash(meta!.tx!.transactionHash), true);
@@ -127,7 +127,7 @@ describe("contracts", function () {
127127
bucket,
128128
key,
129129
);
130-
strictEqual(object.blobHash, blobHash);
130+
expect(object.blobHash).to.be.a("string");
131131
strictEqual(object.size, 6n);
132132

133133
// at a specific block number
@@ -137,7 +137,7 @@ describe("contracts", function () {
137137
key,
138138
latestBlock,
139139
));
140-
strictEqual(object.blobHash, blobHash);
140+
expect(object.blobHash).to.be.a("string");
141141
strictEqual(object.size, 6n);
142142
});
143143

@@ -263,7 +263,8 @@ describe("contracts", function () {
263263
expect(objects.length).to.be.greaterThan(0);
264264
strictEqual(objects[0]?.key, key);
265265
strictEqual(objects[0]?.state?.size, 6n);
266-
strictEqual(objects[0]?.state?.blobHash, blobHash);
266+
expect(Number(objects[0]?.state?.expiry)).to.be.greaterThan(0);
267+
expect(objects[0]?.state?.blobHash).to.be.a("string");
267268
strictEqual(commonPrefixes.length, 0);
268269

269270
// no objects with prefix
@@ -509,12 +510,24 @@ describe("contracts", function () {
509510
const to = getAddress("0x9965507d1a55bcc2695c58ba16fb37d819b0a4dc");
510511
const subscriptionId = "foobar";
511512
const size = 6n;
512-
const blobHash = "rzghyg4z3p6vbz5jkgc75lk64fci7kieul65o6hk6xznx7lctkmq";
513+
let blobHash: string;
513514

514515
before(async () => {
515516
blobs = client.blobManager(
516517
(BLOB_MANAGER_ADDRESS as Address) ?? undefined,
517518
);
519+
const bucketManager = client.bucketManager(
520+
(BUCKET_MANAGER_ADDRESS as Address) ?? undefined,
521+
);
522+
const fileContents = "hello\n";
523+
const key = "hello/world";
524+
const {
525+
result: { bucket },
526+
} = await bucketManager.create();
527+
const path = await temporaryWrite(fileContents);
528+
await bucketManager.add(bucket, key, path);
529+
const { result } = await bucketManager.getObjectValue(bucket, key);
530+
blobHash = result.blobHash;
518531
});
519532

520533
it("should get added blobs", async () => {

‎packages/sdkx/src/react/buckets.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ export function useAddFile() {
243243
source: uploadRes.node_id,
244244
key: args.key,
245245
blobHash: uploadRes.hash,
246-
recoveryHash: "",
246+
recoveryHash: uploadRes.metadata_hash,
247247
size: BigInt(args.file.size),
248248
ttl: args.options?.ttl ?? 0n,
249249
metadata,

0 commit comments

Comments
 (0)