[contracts] StorageRequest/Offer is object instead of tuple

dagger/contracts/offers.nim

@@ -4,11 +4,25 @@ import pkg/nimcrypto
 export contractabi
 
 type
-  StorageOffer* = tuple
+  StorageOffer* = object
-    host: Address
+    host*: Address
-    requestId: array[32, byte]
+    requestId*: array[32, byte]
-    price: UInt256
+    price*: UInt256
-    expiry: UInt256
+    expiry*: UInt256
+
+func toTuple(offer: StorageOffer): auto =
+  (
+    offer.host,
+    offer.requestId,
+    offer.price,
+    offer.expiry
+  )
+
+func solidityType*(_: type StorageOffer): string =
+  solidityType(typeof StorageOffer.default.toTuple)
+
+func encode*(encoder: var AbiEncoder, offer: StorageOffer) =
+  encoder.write(offer.toTuple)
 
 func id*(offer: StorageOffer): array[32, byte] =
   let encoding = AbiEncoder.encode(offer)

dagger/contracts/requests.nim

@@ -4,15 +4,33 @@ import pkg/nimcrypto
 export contractabi
 
 type
-  StorageRequest* = tuple
+  StorageRequest* = object
-    client: Address
+    client*: Address
-    duration: UInt256
+    duration*: UInt256
-    size: UInt256
+    size*: UInt256
-    contentHash: array[32, byte]
+    contentHash*: array[32, byte]
-    proofProbability: UInt256
+    proofProbability*: UInt256
-    maxPrice: UInt256
+    maxPrice*: UInt256
-    expiry: UInt256
+    expiry*: UInt256
-    nonce: array[32, byte]
+    nonce*: array[32, byte]
+
+func toTuple(request: StorageRequest): auto =
+  (
+    request.client,
+    request.duration,
+    request.size,
+    request.contentHash,
+    request.proofProbability,
+    request.maxPrice,
+    request.expiry,
+    request.nonce
+  )
+
+func solidityType*(_: type StorageRequest): string =
+  solidityType(typeof StorageRequest.default.toTuple)
+
+func encode*(encoder: var AbiEncoder, request: StorageRequest) =
+  encoder.write(request.toTuple)
 
 func id*(request: StorageRequest): array[32, byte] =
   let encoding = AbiEncoder.encode(request)

dagger/purchasing.nim

@@ -41,7 +41,7 @@ proc getNonce(): array[32, byte] =
   doAssert randomBytes(result) == 32
 
 proc purchase*(purchasing: Purchasing, request: PurchaseRequest): Purchase =
-  let request: StorageRequest = (
+  let request = StorageRequest(
     client: Address.default, # TODO
     duration: request.duration,
     size: request.size,

tests/contracts/examples.nim

@@ -11,7 +11,7 @@ proc example*(_: type Address): Address =
   Address(randomBytes(20))
 
 proc example*(_: type StorageRequest): StorageRequest =
-  (
+  StorageRequest(
     client: Address.example,
     duration: (10 * 60 * 60).u256, # 10 hours
     size: (1 * 1024 * 1024 * 1024).u256, # 1 Gigabyte
@@ -23,7 +23,7 @@ proc example*(_: type StorageRequest): StorageRequest =
   )
 
 proc example*(_: type StorageOffer): StorageOffer =
-  (
+  StorageOffer(
     host: Address.example,
     requestId: StorageRequest.example.id,
     price: 42.u256,