Resolve merge conflicts

ecadlabs · Sep 1, 2023 · 512a614 · 512a614
1 parent 9e07e3c
commit 512a614
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/integration-tests/config.ts b/integration-tests/config.ts
@@ -8,6 +8,7 @@ import { KnownContracts } from './known-contracts';
 import { knownContractsProtoALph } from './known-contracts-ProtoALph';
 import { knownContractsPtGhostnet } from './known-contracts-PtGhostnet';
 import { knownContractsPtNairobi } from './known-contracts-PtNairobi';
+import { knownContractsProxford } from './known-contracts-Proxford';
 
 const nodeCrypto = require('crypto');
 
@@ -145,6 +146,18 @@ const nairobinetEphemeral: Config =
 const nairobinetSecretKey: Config =
   { ...nairobinetEphemeral, ...{ signerConfig: defaultSecretKey },  ...{ defaultRpc: 'http://ecad-nairobinet-full:8732' } };
 
+const oxfordnetEphemeral: Config =
+  defaultConfig({
+    networkName: 'OXFORDNET',
+    protocol: Protocols.Proxford,
+    defaultRpc: 'http://ecad-oxfordnet-full.i.tez.ie:8732',
+    knownContracts: knownContractsProxford,
+    signerConfig: defaultEphemeralConfig('https://keygen.ecadinfra.com/oxfordnet')
+  });
+
+const oxfordnetSecretKey: Config =
+  { ...oxfordnetEphemeral, ...{ signerConfig: defaultSecretKey } };
+
 const ghostnetEphemeral: Config =
   defaultConfig({
     networkName: 'GHOSTNET',

diff --git a/integration-tests/known-contracts-Proxford.ts b/integration-tests/known-contracts-Proxford.ts
@@ -1,5 +1,8 @@
-export const knownContractProxford = "KT1TU9LydXWri8CBTQmzwnwjCm3dK8jt1LQA";
-export const knownBigMapContractProxford = "KT1MYLamQavaVMYqgn9f4gMgHzEZfQD73qYs";
-export const knownTzip12BigMapOffChainContractProxford = "KT1XX1JK4C7aPL2joE7nfeWRwPdrJYwroAUa";
-export const knownSaplingContractProxford = "KT1MfFxdU3kpXMSmHZN4tYBbYkGRAbLt5Q1Y";
-export const knownOnChainViewContractAddressProxford = "KT1TYMtN2yFQDmk82VFymQeZapp6BF1NsZ7B";
+import { KnownContracts } from './known-contracts';
+export const knownContractsProxford: KnownContracts = {
+    contract: "KT1TU9LydXWri8CBTQmzwnwjCm3dK8jt1LQA",
+    bigMapContract: "KT1MYLamQavaVMYqgn9f4gMgHzEZfQD73qYs",
+    tzip12BigMapOffChainContract: "KT1XX1JK4C7aPL2joE7nfeWRwPdrJYwroAUa",
+    saplingContract: "KT1MfFxdU3kpXMSmHZN4tYBbYkGRAbLt5Q1Y",
+    onChainViewContractAddress: "KT1TYMtN2yFQDmk82VFymQeZapp6BF1NsZ7B"
+};